merge-update from trunk

[taxeditor.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 0de962a860089f2afb404cd1115360ae0ef95aad..801c135a8a2c7a9fc472eb60c84ff2ef6867e9d5 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1868,7 +1868,6 @@ eu.etaxonomy.taxeditor/.project -text
 eu.etaxonomy.taxeditor/README.txt -text
 eu.etaxonomy.taxeditor/deploy_nightly.sh -text
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text
-eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre -text
 eu.etaxonomy.taxeditor/plugin_customization.ini -text
 eu.etaxonomy.taxeditor/pom.xml -text
 eu.etaxonomy.taxeditor/rcp.target -text