Merge branch 'release/4.5.0'

[taxeditor.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 877a615a022cb9b9e3ca73dbe3410a5cfe62fb2c..177934b63a27ee3cd514cd06d3ab13d923d976ae 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1975,7 +1975,7 @@ src/site/resources/images/taxeditor_transformed.png -text
 src/site/site.xml -text
 
 # The following files will be ignored when merging another
-# branch into this branch in case of merge conflict and 
+# branch into this branch in case of merge conflict and
 # if the 'ours' merge driver is configured.
 # WARNING : This merge driver should NOT be set in development
 #           environments. It is supposed to be used only in CI
@@ -1987,5 +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/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