1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/SvnKitConflictClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/SvnKitConflictClient.java
index b60ea38bd422..80fab5aede64 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/SvnKitConflictClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/conflict/SvnKitConflictClient.java
@@ -4,7 +4,7 @@ import com.intellij.openapi.vcs.VcsException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.api.BaseSvnClient;
-import org.tmatesoft.svn.core.SVNDepth;
+import org.jetbrains.idea.svn.api.Depth;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.wc.SVNConflictChoice;
 
@@ -16,13 +16,13 @@ import java.io.File;
 public class SvnKitConflictClient extends BaseSvnClient implements ConflictClient {
   @Override
   public void resolve(@NotNull File path,
-                      @Nullable SVNDepth depth,
+                      @Nullable Depth depth,
                       boolean resolveProperty,
                       boolean resolveContent,
                       boolean resolveTree) throws VcsException {
     try {
       myVcs.getSvnKitManager().createWCClient()
-        .doResolve(path, depth, resolveContent, resolveProperty, resolveTree, SVNConflictChoice.MERGED);
+        .doResolve(path, toDepth(depth), resolveContent, resolveProperty, resolveTree, SVNConflictChoice.MERGED);
     }
     catch (SVNException e) {
       throw new VcsException(e);