diff -r a081458cc57b -r 144a6b854f70 eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py --- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat May 22 19:52:34 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat May 22 19:58:24 2021 +0200 @@ -14,7 +14,7 @@ QApplication, QWidget ) -from E5Gui.EricApplication import ericApp +from EricWidgets.EricApplication import ericApp from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog