From 7f2a1ece62f7d75502f3ade7618e0f6377c6ac51 Mon Sep 17 00:00:00 2001
From: Vincent_Michael <Vincent_Michael@gmx.de>
Date: Mon, 4 Feb 2013 22:17:23 +0100
Subject: Fix merge fail (fucking saving button -.-)

---
 sql/base/auth_database.sql | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'sql/base/auth_database.sql')

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 14c5d2e8a92..f72d66a2fec 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -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
-- 
cgit v1.2.3