From: Cherian Mathew <c.mathew@bgbm.org>
Date: Fri, 11 Sep 2015 13:29:12 +0000 (+0200)
Subject: Fix incorrect merge
X-Git-Tag: remoting-3.9.0~5
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/253716a14a1625d9d5aa54002457aa2931813d11

Fix incorrect merge
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index bb3de368c..deffedc82 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -176,7 +176,7 @@ bin.includes = META-INF/,\
                lib/google-api-translate-java-0.92.jar,\
                lib/odfdom-0.8.jar,\
                lib/h2mig_pagestore_addon.jar,\
-               lib/spring-security-remoting-3.1.3.RELEASE.jar,\	
+               lib/spring-security-remoting-3.1.3.RELEASE.jar,\
                lib/spring-security-remoting-3.1.3.RELEASE.jar,\
                lib/jena-core-2.11.2.jar,\
                lib/jena-iri-1.0.2.jar,\
@@ -195,6 +195,7 @@ bin.includes = META-INF/,\
                lib/cdmlib-services-3.9.0-SNAPSHOT.jar,\
                lib/apache-log4j-extras-1.2.17.jar,\
                resources/cdm.map.ser
+
 jars.compile.order = .
 output.. = bin/
 source.. = src/main/java/,\