Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge fail (fucking saving button -.-)

Browse Source
This commit is contained in:
Vincent_Michael
2013-02-04 22:17:23 +01:00
parent 12c8cdc26c
commit 7f2a1ece62
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/base/auth_database.sql
View File

@@ -489,8 +489,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
<<<<<<< HEAD
-- Dump completed on 2012-08-08 19:01:34
=======
-- Dump completed on 2013-02-04 16:07:23
>>>>>>> 8f6e9dc85ccda388bc5ced1921cd4e30cb5fe2e0