BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 266a4ad)
removing .classpath file from merge strategy configuration - file is no longer in git
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 10 Feb 2021 09:07:44 +0000 (10:07 +0100)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Wed, 10 Feb 2021 09:07:44 +0000 (10:07 +0100)
.gitattributes patch | blob | history

diff --git a/.gitattributes b/.gitattributes
index fd90eb5090b6dd5e798ad721fd1e84a1b0097522..7ce478b4b813d8935dbe7e6c2371d1657693c385 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1871,7 +1871,6 @@ eu.etaxonomy.taxeditor.molecular/src/test/java/eu/etaxonomy/taxeditor/molecular/
 **/pom.xml merge=ours
 **/MANIFEST.MF merge=ours
 **/feature.xml merge=ours
-eu.etaxonomy.taxeditor.cdmlib/.classpath merge=ours
 eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours
 eu.etaxonomy.taxeditor.printpublisher/build.properties merge=ours
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours