diff -r 0c7a44af84bc -r 962bce857696 eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sun May 16 20:07:24 2021 +0200
@@ -8,8 +8,8 @@
conflicts.
"""
-from PyQt5.QtCore import pyqtSlot, Qt, QPoint
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtWidgets import (
QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem,
QApplication, QWidget
)
