From: Cherian Mathew <c.mathew@bgbm.org>
Date: Fri, 9 Oct 2015 12:17:18 +0000 (+0200)
Subject: Add missing files to ignore on merge conflict
X-Git-Tag: 3.12.0^2~101
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/51c5b735effbb08ab57afd5c4817c6ef42ace245

Add missing files to ignore on merge conflict
---

diff --git a/.gitattributes b/.gitattributes
index 37da9b4af..c7b12732e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1980,5 +1980,8 @@ src/site/site.xml -text
 # git config --local merge.ours.driver true
 **/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
\ No newline at end of file
+eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours
+eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours
+eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours
\ No newline at end of file