Updated version in pom / project files to taxeditor version : 3.12.3 and cdmlib versi...

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / .gitignore

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.gitignore b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
index 1fa4977834fa6a265bebdb83c4d9ac0c06a8707c..41b529a2179c63c4a7fdeb5afd85cd68ed2e5720 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.gitignore
+++ b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
@@ -1,5 +1,5 @@
-<<<<<<< HEAD
 bin
-=======
-bin
->>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf
+/target/
+/target/
+/target/
+/target/