1 files changed, 14 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index 1b25c76446..7a2f2fc106 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -84,6 +84,7 @@ import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
 import org.eclipse.emf.cdo.spi.common.revision.PointerCDORevision;
 import org.eclipse.emf.cdo.spi.common.revision.RevisionInfo;
 import org.eclipse.emf.cdo.spi.server.ContainerQueryHandlerProvider;
+import org.eclipse.emf.cdo.spi.server.ICommitConflictResolver;
 import org.eclipse.emf.cdo.spi.server.InternalCommitContext;
 import org.eclipse.emf.cdo.spi.server.InternalCommitManager;
 import org.eclipse.emf.cdo.spi.server.InternalLockManager;
@@ -199,6 +200,8 @@ public class Repository extends Container<Object> implements InternalRepository,
 
   private InternalCDOCommitInfoManager commitInfoManager;
 
+  private ICommitConflictResolver commitConflictResolver;
+
   private InternalSessionManager sessionManager;
 
   private InternalQueryManager queryManager;
@@ -1045,6 +1048,17 @@ public class Repository extends Container<Object> implements InternalRepository,
     this.commitInfoManager = commitInfoManager;
   }
 
+  public ICommitConflictResolver getCommitConflictResolver()
+  {
+    return commitConflictResolver;
+  }
+
+  public void setCommitConflictResolver(ICommitConflictResolver commitConflictResolver)
+  {
+    checkInactive();
+    this.commitConflictResolver = commitConflictResolver;
+  }
+
   public InternalCDORevisionManager getRevisionManager()
   {
     return revisionManager;