X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/cdcb5ddf19a1bb01fd453e40705d964f14e8e6ea..ae55584a0f0441e8f088464734f38185920732f0:/.gitattributes diff --git a/.gitattributes b/.gitattributes index b1ef5559e..177934b63 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1987,6 +1987,11 @@ src/site/site.xml -text **/feature.xml merge=ours eu.etaxonomy.taxeditor.cdmlib/.classpath merge=ours eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours -eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/ExportSingleReadAlignmentWizardPage.java -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/ExportSequenceToFileHandler.java -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/CDMSequenceMatrixAdapter.java -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIterator.java -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/wizard/ExportSingleReadAlignmentWizard.java -text +eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/wizard/ExportSingleReadAlignmentWizardPage.java -text +eu.etaxonomy.taxeditor.molecular/src/test/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIteratorTest.java -text eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours