Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-05-17 07:26:13 +0000
committerEike Stepper2015-05-17 07:26:13 +0000
commit240db15b894f6102baa601b788eafb5e05ceeb6f (patch)
treef95344713312b37bc15fb5dd8d268ab7aff34c80 /plugins/org.eclipse.emf.cdo.explorer.ui
parent4a98b2227b6ed312a430d986f86062798d5ef0eb (diff)
downloadcdo-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
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml2
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://.*">

Back to the top