mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Repair incorrect conflict repair
This commit is contained in:
parent
e4b514d2e6
commit
9e78d87255
@ -11,7 +11,7 @@ from datetime import date
|
||||
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…
x
Reference in New Issue
Block a user