missed to commit adapted manifest

[taxeditor.git] / eu.etaxonomy.taxeditor.test / META-INF / MANIFEST.MF

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 45db92dadf50255b4c5a1ff680c4054cd826e0e4..5d9ade617ef67bac21aaa39ff10871dc1befc749 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -2,11 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-<<<<<<< HEAD
 Bundle-Version: 5.19.0.qualifier
-=======
-Bundle-Version: 5.13.1
->>>>>>> Updated version in pom / project files to taxeditor version : 5.13.1 and cdmlib version : 5.13.0
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8