Repair incorrect conflict repair

This commit is contained in:
Charles Haley 2010-04-23 21:28:14 +01:00
parent e4b514d2e6
commit 9e78d87255

View File

@ -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, \