X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/e1c012ef4d34b6ce5f2f9065d9da1c1bd4922425..dde2b10765b9620befc27cf3da4e075201d77f51:/eu.etaxonomy.taxeditor.cdmlib/.gitignore

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.gitignore b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
index ba077a403..1fa497783 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.gitignore
+++ b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
@@ -1 +1,5 @@
+<<<<<<< HEAD
 bin
+=======
+bin
+>>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf