BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 9524fa3)
Add missing files to ignore on merge conflict
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 12:17:18 +0000 (14:17 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 12:17:18 +0000 (14:17 +0200)
.gitattributes patch | blob | history

diff --git a/.gitattributes b/.gitattributes
index 37da9b4aff853b8d9905c99416b3a3561afea302..c7b12732ea828b23334c43a93041d51136f034dc 100644 (file)
--- 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