From fbedcb2325afa80c8e778152e0553c3767fb14a1 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Wed, 16 Sep 2015 21:24:25 +0200 Subject: [PATCH] Fix merge --- eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF | 1 - eu.etaxonomy.taxeditor.cdmlib/build.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 58774bcc9..5e1f96d91 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -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 diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties index f38d92b03..9d733147c 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@ -192,7 +192,7 @@ bin.includes = META-INF/,\ lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar,\ lib/cdmlib-print-3.12.0-SNAPSHOT.jar,\ lib/cdmlib-remote-3.12.0-SNAPSHOT.jar,\ - lib/cdmlib-services-3.12.0-SNAPSHOT.jar.\ + lib/cdmlib-services-3.12.0-SNAPSHOT.jar,\ lib/apache-log4j-extras-1.2.17.jar,\ resources/cdm.map.ser -- 2.34.1