eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py

branch
eric7
changeset 8621
8c9f41115c04
parent 8358
144a6b854f70
child 8881
54e42bc2437a
--- 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):
         """

eric ide

mercurial