fixed syncdb

gms-metadatacrawler/src/main/java/de/potsdam/gfz/gms/metadatacrawler/SyncDatabases.java

@@ -7,10 +7,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import org.postgis.PGgeometry;
@@ -57,11 +54,6 @@ public class SyncDatabases {
 
 		connectToDestinationDB();
 
-<<<<<<< HEAD
-=======
-		// short l8Dataset = 104;
-		// short l7Dataset = 112;
->>>>>>> 55b22a10b5881af249c0472c315f352776958996
 		short s2Dataset = 249;
 		short l8Dataset = 250;
 		short l7Dataset = 251;