diff options
Diffstat (limited to 'data/help/support.txt')
| -rw-r--r-- | data/help/support.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/data/help/support.txt b/data/help/support.txt index 819516de..44fd08f3 100644 --- a/data/help/support.txt +++ b/data/help/support.txt @@ -7,11 +7,7 @@ can't find a solution to your problem, feel free to check our Bugs/Support section of the forum: -<<<<<<< HEAD:data/help/support.txt ##2 http://forums.aethyra.com -======= -##2 http://forums.themanaworld.org/viewforum.php?f=3 ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:data/help/support.txt or come visit us on our IRC channel: |