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
- branch
- 6_1_x
- changeset 5251
- 7d956dc02d8e
- parent 5249
- a114f080572f
- child 5261
- e9e24583e6f4
Fixed a wrong import in the Mercurial conflicts dialog.
(grafted from 2f22b20ea9adc7aabcfc7b465a91542ccd106c26)
| Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py | file | annotate | diff | comparison | revisions |
--- 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
