Fix merge remoting-4.0 root/branches/taxeditor/remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 16 Sep 2015 19:24:25 +0000 (21:24 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 16 Sep 2015 19:24:25 +0000 (21:24 +0200)
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

index 58774bcc933f16f46302789c3ecbfd8e6af5a56d..5e1f96d912c26b4aa6fa930a4b60aa5f713e493a 100644 (file)
@@ -666,5 +666,4 @@ Bundle-ClassPath: .,
  lib/cdmlib-print-3.12.0-SNAPSHOT.jar,
  lib/cdmlib-remote-3.12.0-SNAPSHOT.jar,
  lib/cdmlib-services-3.12.0-SNAPSHOT.jar
-
 Import-Package: eu.etaxonomy.cdm.api.application
index f38d92b03917b64a0696eaba516c9662b6694b17..9d733147ce77174b2b63a0c6255a777a67525d18 100644 (file)
@@ -192,7 +192,7 @@ bin.includes = META-INF/,\
                lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar,\\r
                lib/cdmlib-print-3.12.0-SNAPSHOT.jar,\\r
                lib/cdmlib-remote-3.12.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.12.0-SNAPSHOT.jar.\\r
+               lib/cdmlib-services-3.12.0-SNAPSHOT.jar,\\r
                lib/apache-log4j-extras-1.2.17.jar,\\r
                resources/cdm.map.ser\r
 \r