mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-04-24 10:55:26 +02:00
Repair incorrect conflict repair
This commit is contained in:
parent
e4b514d2e6
commit
9e78d87255
1 changed files with 1 additions and 1 deletions
|
|
@ -11,7 +11,7 @@
|
|||
from PyQt4.QtGui import QTableView, QAbstractItemView, QColor, \
|
||||
QPainterPath, QLinearGradient, QBrush, \
|
||||
QPen, QStyle, QPainter, QStyleOptionViewItemV4, \
|
||||
QImage, QMenu, \
|
||||
QIcon, QImage, QMenu, \
|
||||
QStyledItemDelegate, QCompleter, QIntValidator, \
|
||||
QPlainTextEdit, QDoubleValidator, QCheckBox, QMessageBox
|
||||
from PyQt4.QtCore import QAbstractTableModel, QVariant, Qt, pyqtSignal, \
|
||||
|
|
|
|||
Loading…
Reference in a new issue