remove git merge comment in plugin.xml

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index f7f9dead5613dc4561221f1eaf4ae1d0442d7463..a23d8c25c8a754ab703c8582403fad0003c386e2 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -653,10 +653,6 @@
             id="eu.etaxonomy.taxeditor.store.open.OpenDistributionEditorWizardHandler"
             name="%command.name.11">
       </command>
-<<<<<<< 3aacef44648dc3a179757521f323b93451654a21
-      
-=======
->>>>>>> Remove already converted e3 handler
       <command
             defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.ChangeConnectionHandler"
             id="eu.etaxonomy.taxeditor.datasource.connect"