commit bea13cde983d0aa91f7c3e6eb746adae7c63654d
Author: Patrick Plitzner
Date: Wed Jul 5 08:51:06 2017 +0200
Remove already converted e3 handler
diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index 54e4f6c15..f7f9dead5 100755
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -653,7 +653,10 @@
id="eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardHandler"
name="%command.name.11">
+<<<<<<< 3aacef44648dc3a179757521f323b93451654a21
+=======
+>>>>>>> Remove already converted e3 handler