1 files changed, 0 insertions, 15 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index bb3c324491..b778fcedee 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -303,21 +303,6 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
     return conflicts;
   }
 
-  /**
-   * @since 2.0
-   */
-  @Deprecated
-  public void resolveConflicts(CDOConflictResolver... resolvers)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Deprecated
-  public void handleConflicts(Set<CDOObject> conflicts)
-  {
-    throw new UnsupportedOperationException();
-  }
-
   public CDOChangeSetData getChangeSetData()
   {
     checkActive();