Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Fix merge fail (fucking saving button -.-)

Browse Source
This commit is contained in:
Vincent_Michael committed 2013-02-04 22:17:23 +01:00
1 parent 12c8cdc26c
commit 7f2a1ece62
1 file changed
-4
Download Patch File Download Diff File Expand all files Collapse all files
sql/base/auth_database.sql
-4
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