From dbdbebfd5a5c76ea389fdda7da239fffa0485c68 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Sun, 3 Oct 2004 15:33:52 +0000
Subject: *** empty log message ***

---
 tmw.ini | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tmw.ini')

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
-- 
cgit v1.2.3-70-g09d2