Mercurial > hg > nodescore

changeset 37:1b8d0935b749

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
post merge
author tzara <rc-web@kiben.net>
date Sun, 19 Aug 2012 22:29:24 +0000
parents 1d029c2132bd
children ea8d61c851c0
files 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
diffstat 7 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/nodescore	Sun Aug 19 23:26:12 2012 +0100
+++ b/nodescore	Sun Aug 19 22:29:24 2012 +0000
@@ -9,13 +9,6 @@
 # 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'
@@ -23,7 +16,6 @@
 SERVER='http://nodescore.kiben.net:8889'
 fi
 
->>>>>>> e5570c45fd9ce4e9246a9c7ecd5e38b48b88564a
 BASEDIR='www/m'
 PROJECT='seta'
 THUMBPATH=$BASEDIR/thumbs
Binary file www/m/thumbs/1.png has changed
Binary file www/m/thumbs/2.png has changed
Binary file www/m/thumbs/3.png has changed
Binary file www/m/thumbs/4.png has changed
Binary file www/m/thumbs/5.png has changed
Binary file www/m/thumbs/6.png has changed