diff options
| author | Victor Roldan Betancort | 2009-05-07 12:10:53 +0000 |
|---|---|---|
| committer | Victor Roldan Betancort | 2009-05-07 12:10:53 +0000 |
| commit | b65d6bd3ecf777b527a28195ebdf01d2123e08d0 (patch) | |
| tree | 7f7ee2f4f49fe34d8d91c8ea8026465d47e50e2c /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi | |
| parent | d7d8be53830f843ca704870bd5a719090ddaa36e (diff) | |
| download | cdo-b65d6bd3ecf777b527a28195ebdf01d2123e08d0.tar.gz cdo-b65d6bd3ecf777b527a28195ebdf01d2123e08d0.tar.xz cdo-b65d6bd3ecf777b527a28195ebdf01d2123e08d0.zip | |
[272190] [UI] Externalize Strings (CDO)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=272190
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java index 0fef742fb7..8164870dff 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java @@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.common.id.CDOID; import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta; import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.common.util.CDOException; -import org.eclipse.emf.cdo.messages.Messages; import org.eclipse.emf.cdo.spi.common.revision.CDORevisionMerger; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision; import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta; @@ -31,6 +30,7 @@ import org.eclipse.emf.cdo.view.CDOAdapterPolicy; import org.eclipse.emf.internal.cdo.CDOObjectMerger; import org.eclipse.emf.internal.cdo.CDOStateMachine; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.messages.Messages; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; |