X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/b330e10d291b5d6c06de8591d3e946488e0526ed..f7112c5f856e1904548fa3d346ded30da0d0b16e:/.gitattributes diff --git a/.gitattributes b/.gitattributes index b777e5c2d..177934b63 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1989,8 +1989,9 @@ 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/ExportSingleReadAlignmentWizardPage.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