BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/3.7.0'
[taxeditor.git]
/
eu.etaxonomy.taxeditor.feature
/
feature.xml
diff --git
a/eu.etaxonomy.taxeditor.feature/feature.xml
b/eu.etaxonomy.taxeditor.feature/feature.xml
index 53ffb9ba873278506abffce993fbfc294b362bf2..92d7ebe7c71900b09d598fe30b62ba24773c79d1 100644
(file)
--- a/
eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/
eu.etaxonomy.taxeditor.feature/feature.xml
@@
-2,7
+2,11
@@
<feature
id="eu.etaxonomy.taxeditor.feature"
label="Taxonomic Editor"
<feature
id="eu.etaxonomy.taxeditor.feature"
label="Taxonomic Editor"
+<<<<<<< HEAD
+ version="3.6.1"
+=======
version="3.7.0"
version="3.7.0"
+>>>>>>> refs/heads/release/3.7.0
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux,macosx,win32"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux,macosx,win32"