diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py Tue Oct 18 16:06:21 2022 +0200
@@ -10,7 +10,7 @@
from PyQt6.QtCore import pyqtSlot
from PyQt6.QtWidgets import QDialog, QDialogButtonBox
-from EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricApplication import ericApp
from .Ui_GitMergeDialog import Ui_GitMergeDialog
