From 9e78d87255e30d15bbc8ddccb07f0ceb3a98b044 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 23 Apr 2010 21:28:14 +0100
Subject: [PATCH] Repair incorrect conflict repair

---
 src/calibre/gui2/library.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py
index 707863d482..7cc264344c 100644
--- a/src/calibre/gui2/library.py
+++ b/src/calibre/gui2/library.py
@@ -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, \