Fix incorrect merge
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 11 Sep 2015 13:29:12 +0000 (15:29 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 11 Sep 2015 13:29:12 +0000 (15:29 +0200)
eu.etaxonomy.taxeditor.cdmlib/build.properties

index bb3de368cbcb706f58ad83ac3e366c57b52c68f1..deffedc8257a83e429b570bf688ee72d6f2aad0e 100644 (file)
@@ -176,7 +176,7 @@ bin.includes = META-INF/,\
                lib/google-api-translate-java-0.92.jar,\\r
                lib/odfdom-0.8.jar,\\r
                lib/h2mig_pagestore_addon.jar,\\r
-               lib/spring-security-remoting-3.1.3.RELEASE.jar,\        \r
+               lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
                lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
                lib/jena-core-2.11.2.jar,\\r
                lib/jena-iri-1.0.2.jar,\\r
@@ -195,6 +195,7 @@ bin.includes = META-INF/,\
                lib/cdmlib-services-3.9.0-SNAPSHOT.jar,\\r
                lib/apache-log4j-extras-1.2.17.jar,\\r
                resources/cdm.map.ser\r
+\r
 jars.compile.order = .\r
 output.. = bin/\r
 source.. = src/main/java/,\\r