X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/3cb0b24a1580129d391b0266b9cb44108b983b6d..144176fe0bd3e5ea64de7b4ea421fe2805243056:/.gitattributes?ds=sidebyside

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