Mercurial Repositories > eric / file diff

diff -r 84f7f7867b5f -r 8c9f41115c04 eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py
--- a/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Mon Sep 20 19:47:18 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Tue Sep 21 19:11:31 2021 +0200
@@ -609,7 +609,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):
         """