X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/59be9831d68e209e727bbd1df9d6cdd952d2e051..5f02ad3ea8a8bea5f2f8c9153d0cdf90f8aabbc5:/eu.etaxonomy.taxeditor.cdmlib/.classpath
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 26071bb25..b0c8a2f1a 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -3,7 +3,6 @@
-
@@ -29,22 +28,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -157,7 +140,6 @@
-
@@ -209,5 +191,31 @@
+
+
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> 02176688eaa23a31ff5b71c317cb5ee685483aa4
+
+
+
+
+