moparisthebest/MoparClassic
1
0
Fork 0
mirror of https://github.com/moparisthebest/MoparClassic synced 2025-03-07 19:59:51 -05:00
Code Issues Releases Wiki Activity

Fixed from merge.

Browse Source
This commit is contained in:
CodeForFame 2011-06-24 16:58:42 -05:00
parent 7fb4b90387
commit 990c5673a1
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GameServer/alert-config.xml
View File

@ -22,9 +22,4 @@
<priority>1</priority> <priority>1</priority>
</email> </email>
</user> </user>
<<<<<<< HEAD
</alert> </alert>
=======
</alert>
>>>>>>> upstream/master