# HG changeset patch
# User tzara <rc-web@kiben.net>
# Date 1345413588 -3600
# Node ID 5088859ace722f9025affe30f186afb3d1b79dc3
# Parent  0123b4602f8e29bc9d3dd1f0c3b84ee33c704107# Parent  c4719d1b7633e1431217e5619464e727cf75a75e
Merge branch 'master' of git://gitorious.org/nodescore/nodescore

Conflicts:
	nodescore
	www/m/thumbs/1.png
	www/m/thumbs/2.png
	www/m/thumbs/3.png
	www/m/thumbs/4.png
	www/m/thumbs/5.png
	www/m/thumbs/6.png

diff -r c4719d1b7633 -r 5088859ace72 nodescore
--- a/nodescore	Sun Aug 19 21:44:23 2012 +0000
+++ b/nodescore	Sun Aug 19 22:59:48 2012 +0100
@@ -9,7 +9,11 @@
 # nodescore@kiben.net
 # nodescore.kiben.net
 
+<<<<<<< HEAD
+SERVER='http://192.168.1.66:8889'
+=======
 SERVER='http://nodescore.kiben.net:8889'
+>>>>>>> 5540566b197e81a62fe2897c3065662308f28f50
 BASEDIR='www/m'
 PROJECT='seta'
 THUMBPATH=$BASEDIR/thumbs
diff -r c4719d1b7633 -r 5088859ace72 www/m/thumbs/1.png
Binary file www/m/thumbs/1.png has changed
diff -r c4719d1b7633 -r 5088859ace72 www/m/thumbs/2.png
Binary file www/m/thumbs/2.png has changed
diff -r c4719d1b7633 -r 5088859ace72 www/m/thumbs/3.png
Binary file www/m/thumbs/3.png has changed
diff -r c4719d1b7633 -r 5088859ace72 www/m/thumbs/4.png
Binary file www/m/thumbs/4.png has changed
diff -r c4719d1b7633 -r 5088859ace72 www/m/thumbs/5.png
Binary file www/m/thumbs/5.png has changed
diff -r c4719d1b7633 -r 5088859ace72 www/m/thumbs/6.png
Binary file www/m/thumbs/6.png has changed