From: jenkins <jenkins-int@bgbm.org>
Date: Wed, 15 Jul 2015 15:56:02 +0000 (+0200)
Subject: Merge branch 'release/3.7.0'
X-Git-Tag: 3.7.0~6
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a9f32ef0d94675a7ebc7160dcef25cff8a3b3a15

Merge branch 'release/3.7.0'

Conflicts:
	eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.cdmlib/.classpath
	eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.feature.platform/feature.xml
	eu.etaxonomy.taxeditor.feature/feature.xml
	eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
---

a9f32ef0d94675a7ebc7160dcef25cff8a3b3a15
diff --cc eu.etaxonomy.taxeditor.feature/feature.xml
index 26fe7a261,53ffb9ba8..92d7ebe7c
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@@ -2,7 -2,7 +2,11 @@@
  <feature
        id="eu.etaxonomy.taxeditor.feature"
        label="Taxonomic Editor"
++<<<<<<< HEAD
 +      version="3.6.1"
++=======
+       version="3.7.0"
++>>>>>>> refs/heads/release/3.7.0
        provider-name="EDIT"
        plugin="eu.etaxonomy.taxeditor.application"
        os="linux,macosx,win32"