# HG changeset patch
# User tzara <rc-web@kiben.net>
# Date 1345415172 -3600
# Node ID 1d029c2132bdfe9d602c490097c7fb9974c3e4f4
# Parent  5088859ace722f9025affe30f186afb3d1b79dc3# Parent  5775286673c12d9be2aeb057d448b3743988cc09
Merge branch 'master' of git://gitorious.org/nodescore/nodescore

Conflicts:
	nodescore

diff -r 5088859ace72 -r 1d029c2132bd nodescore
--- 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