<feature
id="eu.etaxonomy.taxeditor.feature"
label="Taxonomic Editor"
- version="3.6.0"
+<<<<<<< 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"