diff options
author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2004-10-03 15:33:52 +0000 |
---|---|---|
committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2004-10-03 15:33:52 +0000 |
commit | dbdbebfd5a5c76ea389fdda7da239fffa0485c68 (patch) | |
tree | e62112ca04ed2dba73b7fd185024c8b4fe43e752 /tmw.ini | |
parent | 2401b8b64f4c7ac574545b4db2dff1f4504a37fb (diff) | |
download | mana-dbdbebfd5a5c76ea389fdda7da239fffa0485c68.tar.gz mana-dbdbebfd5a5c76ea389fdda7da239fffa0485c68.tar.bz2 mana-dbdbebfd5a5c76ea389fdda7da239fffa0485c68.tar.xz mana-dbdbebfd5a5c76ea389fdda7da239fffa0485c68.zip |
*** empty log message ***
Diffstat (limited to 'tmw.ini')
-rw-r--r-- | tmw.ini | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -29,8 +29,4 @@ stretch = 1 [login] remember = 1 -<<<<<<< = tmw.ini -username = test2 -======= username = elven ->>>>>>> = 1.57 |