Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

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

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