# 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 5775286673c1 -r 1d029c2132bd nodescore
--- a/nodescore	Sun Aug 19 22:23:11 2012 +0000
+++ b/nodescore	Sun Aug 19 23:26:12 2012 +0100
@@ -9,6 +9,13 @@
 # nodescore@kiben.net
 # 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'
@@ -16,6 +23,7 @@
 SERVER='http://nodescore.kiben.net:8889'
 fi
 
+>>>>>>> e5570c45fd9ce4e9246a9c7ecd5e38b48b88564a
 BASEDIR='www/m'
 PROJECT='seta'
 THUMBPATH=$BASEDIR/thumbs
diff -r 5775286673c1 -r 1d029c2132bd www/m/thumbs/1.png
Binary file www/m/thumbs/1.png has changed
diff -r 5775286673c1 -r 1d029c2132bd www/m/thumbs/2.png
Binary file www/m/thumbs/2.png has changed
diff -r 5775286673c1 -r 1d029c2132bd www/m/thumbs/3.png
Binary file www/m/thumbs/3.png has changed
diff -r 5775286673c1 -r 1d029c2132bd www/m/thumbs/4.png
Binary file www/m/thumbs/4.png has changed
diff -r 5775286673c1 -r 1d029c2132bd www/m/thumbs/5.png
Binary file www/m/thumbs/5.png has changed
diff -r 5775286673c1 -r 1d029c2132bd www/m/thumbs/6.png
Binary file www/m/thumbs/6.png has changed