--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sun May 16 11:43:59 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sun May 16 20:07:24 2021 +0200 @@ -9,7 +9,7 @@ import re -from PyQt5.QtWidgets import QDialog, QDialogButtonBox +from PyQt6.QtWidgets import QDialog, QDialogButtonBox from .Ui_SvnMergeDialog import Ui_SvnMergeDialog