eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/concurrent-1.3.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/dom4j-1.6.1.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/fop-1.1.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/h2mig_pagestore_addon.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hamcrest-core-1.3.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/icu4j-2.6.1.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jakarta-regexp-1.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jdbc4-2.0.jar -text
src/site/resources/css/site.css -text
src/site/resources/images/taxeditor_transformed.png -text
src/site/site.xml -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
# The following files will be ignored when merging another
# branch into this branch in case of merge conflict and
**/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
-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.printpublisher/build.properties merge=ours
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours
+eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours
+
+