summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2004-10-03 15:33:52 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2004-10-03 15:33:52 +0000
commitdbdbebfd5a5c76ea389fdda7da239fffa0485c68 (patch)
treee62112ca04ed2dba73b7fd185024c8b4fe43e752
parent2401b8b64f4c7ac574545b4db2dff1f4504a37fb (diff)
downloadmana-dbdbebfd5a5c76ea389fdda7da239fffa0485c68.tar.gz
mana-dbdbebfd5a5c76ea389fdda7da239fffa0485c68.tar.bz2
mana-dbdbebfd5a5c76ea389fdda7da239fffa0485c68.tar.xz
mana-dbdbebfd5a5c76ea389fdda7da239fffa0485c68.zip
*** empty log message ***
-rw-r--r--tmw.ini4
1 files changed, 0 insertions, 4 deletions
diff --git a/tmw.ini b/tmw.ini
index 7102ec29..6eb92a80 100644
--- a/tmw.ini
+++ b/tmw.ini
@@ -29,8 +29,4 @@ stretch = 1
[login]
remember = 1
-<<<<<<< = tmw.ini
-username = test2
-=======
username = elven
->>>>>>> = 1.57