Mercurial > hg > nodescore

changeset 33:5088859ace72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author tzara <rc-web@kiben.net>
date Sun, 19 Aug 2012 22:59:48 +0100
parents 0123b4602f8e (diff) c4719d1b7633 (current diff)
children 1d029c2132bd
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, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
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