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