diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java index fc65b55ac2..38a7aa1d60 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java +++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java @@ -41,8 +41,8 @@ public class SolveConflictHandler extends AbstractHandler if (activeEditor instanceof IDawnEditor) { MessageDialog dialog = new MessageDialog(DawnEditorHelper.getActiveShell(), "Conflict", null, - "There are conflicts in your diagram. Would you like to rollback your current transaction?", - MessageDialog.QUESTION, new String[] { "yes", "no", "Cancel" }, 1); + "There are conflicts in your diagram. Would you like to rollback your current transaction?", MessageDialog.QUESTION, + new String[] { "yes", "no", "Cancel" }, 1); switch (dialog.open()) { |