X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/3cb0b24a1580129d391b0266b9cb44108b983b6d..d2f3794a26d9c4ecef509c22c28cf7ec02f24fc8:/.gitattributes diff --git a/.gitattributes b/.gitattributes index 37da9b4af..877a615a0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -963,6 +963,10 @@ eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java -text eu.etaxonomy.taxeditor.help/toc.xml -text eu.etaxonomy.taxeditor.help/tocgettingstarted.xml -text eu.etaxonomy.taxeditor.help/tocnameparser.xml -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorActionUpdater.java -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AbstractFocusedAlignmentAreaHandler.java -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AlignmentEditorCutHandler.java -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AlignmentEditorPasteHandler.java -text eu.etaxonomy.taxeditor.navigation/.classpath -text eu.etaxonomy.taxeditor.navigation/.project -text eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF -text @@ -1980,5 +1984,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