diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java | 4 |
1 files changed, 2 insertions, 2 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 42ffba2878..dfa0b2a037 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 @@ -176,8 +176,8 @@ public abstract class AbstractObjectConflictResolver extends AbstractConflictRes CDOChangeSetData localChangeSet = transaction.getChangeSetData(); transaction.rollback(); - transaction.applyChangeSetData(remoteChangeSet, transaction, transaction, transaction); - transaction.applyChangeSetData(localChangeSet, transaction, transaction, transaction); + transaction.applyChangeSet(remoteChangeSet, transaction, transaction, transaction); + transaction.applyChangeSet(localChangeSet, transaction, transaction, transaction); } private CDOChangeSetData createChangeSet(List<CDORevisionDelta> revisionDeltas) |