Mercurial Repositories > eric / file diff

diff -r 27f636beebad -r 2c730d5fd177 eric6/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Tue Mar 02 17:17:09 2021 +0100
@@ -36,7 +36,8 @@
        
         self.forceCheckBox.setChecked(force)
         
-        self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
+        self.okButton = self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok)
         self.okButton.setEnabled(False)
         
         self.rx_url = re.compile('(?:file:|svn:|svn+ssh:|http:|https:)//.+')