deleted merge-info

[taxeditor.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index b2aa15b00510fafa6fc356c4e37ffde7414e8c3c..b8384ce66d4b1816084939a5994c23eb08c52189 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -189,8 +189,10 @@ eu.etaxonomy.taxeditor.cdmlib/lib/easymockclassextension-2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.4.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.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/guava-r05.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.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-cglib-repack-2.1_3.jar -text
@@ -250,6 +252,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/objenesis-1.2.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-java-0.8.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ognl-2.6.9.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-2.3.jar -text