Mercurial Repositories > eric / changeset
changeset
Fixed a wrong import in the Mercurial conflicts dialog.
Mon, 17 Oct 2016 18:57:24 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 17 Oct 2016 18:57:24 +0200
- changeset 5250
- 2f22b20ea9ad
- parent 5248
- 7675ecd58263
- child 5252
- 321c2003745d
Fixed a wrong import in the Mercurial conflicts dialog.
| Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py | file | annotate | diff | comparison | revisions |
diff -r 7675ecd58263 -r 2f22b20ea9ad Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Mon Oct 17 18:46:35 2016 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Mon Oct 17 18:57:24 2016 +0200 @@ -13,9 +13,8 @@ import os from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer -from PyQt5.QtGui import QWidget from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QLineEdit, QApplication + QTreeWidgetItem, QLineEdit, QApplication, QWidget from E5Gui import E5MessageBox from E5Gui.E5Application import e5App
