Mercurial Repositories > eric / file diff
diff: eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- branch
- eric7
- changeset 8318
- 962bce857696
- parent 8312
- 800c432b34c8
- child 8881
- 54e42bc2437a
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sun May 16 11:43:59 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sun May 16 20:07:24 2021 +0200 @@ -7,8 +7,8 @@ Module implementing a dialog to enter the data for a merge operation. """ -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QDialog, QDialogButtonBox +from PyQt6.QtCore import pyqtSlot +from PyQt6.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgMergeDialog import Ui_HgMergeDialog
