--- a/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Mon Sep 20 19:47:18 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Tue Sep 21 19:11:31 2021 +0200
@@ -592,7 +592,7 @@
         """
         Private slot used to resolve conflicts of the local project.
         """
-        self.vcs.svnResolve(self.project.ppath)
+        self.vcs.vcsResolved(self.project.ppath)
         
     def __svnPropList(self):
         """