diff options
author | Simon Edwardsson <simon@crossnet.se> | 2004-10-03 13:47:44 +0000 |
---|---|---|
committer | Simon Edwardsson <simon@crossnet.se> | 2004-10-03 13:47:44 +0000 |
commit | 9c4d57c8a76f8494d702f733998aaa70eaab0e5e (patch) | |
tree | a66dd5ac210317766a247d80673b32b499280ef9 /tmw.ini | |
parent | 1c44e1f097d387fcce872f4b67c9996c050e83f9 (diff) | |
download | mana-client-9c4d57c8a76f8494d702f733998aaa70eaab0e5e.tar.gz mana-client-9c4d57c8a76f8494d702f733998aaa70eaab0e5e.tar.bz2 mana-client-9c4d57c8a76f8494d702f733998aaa70eaab0e5e.tar.xz mana-client-9c4d57c8a76f8494d702f733998aaa70eaab0e5e.zip |
tmw_bar_proc is added
Diffstat (limited to 'tmw.ini')
-rw-r--r-- | tmw.ini | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -29,4 +29,8 @@ stretch = 1 [login] remember = 1 +<<<<<<< = tmw.ini +username = test +======= username = elven +>>>>>>> = 1.57 |