Remove merge artifacts from sql file

compose/karmen/ldap/Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.2.1
+FROM osixia/openldap:latest
 MAINTAINER Andrea fazzi <andrea.fazzi@carducci-dante.gov.it>
 
 ADD bootstrap /container/service/slapd/assets/config/bootstrap

compose/karmen/sql/karmen_test.sql

@@ -283,8 +283,6 @@ INSERT INTO `files` VALUES (1,'2019-10-02 10:34:03','2019-10-02 10:34:03',NULL,'
 UNLOCK TABLES;
 
 --
-=======
->>>>>>> groups
 -- Table structure for table `group_teachers`
 --
 
@@ -307,8 +305,6 @@ LOCK TABLES `group_teachers` WRITE;
 
 INSERT INTO `group_teachers` VALUES (1,3),(1,6),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),(3,7),(3,8),(3,9),(3,10),(3,11),(4,2),(4,3),(4,4),(4,7);
 
-INSERT INTO `group_teachers` VALUES (1,3),(1,6);
-
 /*!40000 ALTER TABLE `group_teachers` ENABLE KEYS */;
 UNLOCK TABLES;