1 files changed, 4 insertions, 0 deletions

diff --git a/tmw.ini b/tmw.ini
index 6eb92a80..a0ada48c 100644
--- a/tmw.ini
+++ b/tmw.ini
@@ -29,4 +29,8 @@ stretch = 1
 
 [login]
 remember = 1
+<<<<<<< = tmw.ini
+username = test
+=======
 username = elven
+>>>>>>> = 1.57