BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'release/5.30.0' into develop
[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / .gitignore
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.gitignore b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
index 1fa4977834fa6a265bebdb83c4d9ac0c06a8707c..187010da15ae79539a5f98e167cca21ef34966ae 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.gitignore
+++ b/eu.etaxonomy.taxeditor.cdmlib/.gitignore
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
 bin
-=======
-bin
->>>>>>> d24b444b7bf4e1bd048f864bcfede121794caddf
+/target/
+/dev-linked-projects/*-classes