# 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