Mercurial > hg > nodescore
changeset 36:1d029c2132bd
Merge branch 'master' of git://gitorious.org/nodescore/nodescore
Conflicts:
nodescore
| author | tzara <rc-web@kiben.net> |
|---|---|
| date | Sun, 19 Aug 2012 23:26:12 +0100 |
| parents | 5088859ace72 (current diff) 5775286673c1 (diff) |
| children | 1b8d0935b749 |
| files | nodescore |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/nodescore Sun Aug 19 22:59:48 2012 +0100 +++ b/nodescore Sun Aug 19 23:26:12 2012 +0100 @@ -10,10 +10,20 @@ # nodescore.kiben.net <<<<<<< HEAD +<<<<<<< HEAD SERVER='http://192.168.1.66:8889' ======= SERVER='http://nodescore.kiben.net:8889' >>>>>>> 5540566b197e81a62fe2897c3065662308f28f50 +======= +if [ "$1" = "home" ] +then +SERVER='192.168.1.77:8889' +else +SERVER='http://nodescore.kiben.net:8889' +fi + +>>>>>>> e5570c45fd9ce4e9246a9c7ecd5e38b48b88564a BASEDIR='www/m' PROJECT='seta' THUMBPATH=$BASEDIR/thumbs