[319090] Provide a CDOConflictResolver that uses a CDOMerger

https://bugs.eclipse.org/bugs/show_bug.cgi?id=319090

1 files changed, 1 insertions, 7 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
index 977d2c5f16..dc37690940 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
@@ -339,7 +339,7 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
   }
 
   /**
-   * @since 3.1
+   * @since 4.0
    */
   public CDOChangeSetData getChangeSetData()
   {
@@ -519,12 +519,6 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
     delegate.removeTransactionHandler(handler);
   }
 
-  @Deprecated
-  public void resolveConflicts(CDOConflictResolver... resolver)
-  {
-    delegate.resolveConflicts(resolver);
-  }
-
   public CDOChangeSetData merge(CDOBranchPoint source, CDOMerger merger)
   {
     return delegate.merge(source, merger);