diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java index 78baeb647c..0411e6e581 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java @@ -191,7 +191,7 @@ public class ConflictResolverTest extends AbstractCDOTest transaction1.options().addConflictResolver(createConflictResolver()); CDOResource resource1 = transaction1.getOrCreateResource(getResourcePath("/res1")); EList<EObject> contents1 = resource1.getContents(); - // transaction1.commit(); + transaction1.commit(); contents1.add(getModel1Factory().createAddress()); contents1.add(getModel1Factory().createAddress()); |