diff options
author | Eike Stepper | 2015-05-17 07:26:13 +0000 |
---|---|---|
committer | Eike Stepper | 2015-05-17 07:26:13 +0000 |
commit | 240db15b894f6102baa601b788eafb5e05ceeb6f (patch) | |
tree | f95344713312b37bc15fb5dd8d268ab7aff34c80 | |
parent | 4a98b2227b6ed312a430d986f86062798d5ef0eb (diff) | |
download | cdo-240db15b894f6102baa601b788eafb5e05ceeb6f.tar.gz cdo-240db15b894f6102baa601b788eafb5e05ceeb6f.tar.xz cdo-240db15b894f6102baa601b788eafb5e05ceeb6f.zip |
[467442] Add Interactive Transaction Conflict Resolution
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=467442
-rw-r--r-- | plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml index 3b818e6f18..1668c7d6c9 100644 --- a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml @@ -756,7 +756,7 @@ <editorOpener class="org.eclipse.emf.cdo.explorer.ui.checkouts.CDOModelEditorOpener" icon="icons/cdo_editor.gif" - id="org.eclipse.papyrus.cdo.ui.editors.PapyrusCDOEditorOpener" + id="org.eclipse.emf.cdo.explorer.ui.CDOModelEditorOpener" name="CDO Editor" priority="100" regex="cdo\.checkout://.*"> |