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