summaryrefslogtreecommitdiff
path: root/tmw.ini
diff options
context:
space:
mode:
authorSimon Edwardsson <simon@crossnet.se>2004-10-03 13:47:44 +0000
committerSimon Edwardsson <simon@crossnet.se>2004-10-03 13:47:44 +0000
commit9c4d57c8a76f8494d702f733998aaa70eaab0e5e (patch)
treea66dd5ac210317766a247d80673b32b499280ef9 /tmw.ini
parent1c44e1f097d387fcce872f4b67c9996c050e83f9 (diff)
downloadMana-9c4d57c8a76f8494d702f733998aaa70eaab0e5e.tar.gz
Mana-9c4d57c8a76f8494d702f733998aaa70eaab0e5e.tar.bz2
Mana-9c4d57c8a76f8494d702f733998aaa70eaab0e5e.tar.xz
Mana-9c4d57c8a76f8494d702f733998aaa70eaab0e5e.zip
tmw_bar_proc is added
Diffstat (limited to 'tmw.ini')
-rw-r--r--tmw.ini4
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