merge of trunk to the security branch

[taxeditor.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 832721e8e5ed2bb4fec21c49412076370e075097..15b0ce7f617f02ae35dd74c17e5a6fea5056203b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -188,6 +188,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text svneol=unset#application/zip
+eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar -text svneol=unset#application/zip
 eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar -text