summaryrefslogtreecommitdiff
path: root/tmw.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tmw.ini')
-rw-r--r--tmw.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmw.ini b/tmw.ini
index a0ada48c..7102ec29 100644
--- a/tmw.ini
+++ b/tmw.ini
@@ -30,7 +30,7 @@ stretch = 1
[login]
remember = 1
<<<<<<< = tmw.ini
-username = test
+username = test2
=======
username = elven
>>>>>>> = 1.57