diff options
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index fad09a1..91baf19 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -82,8 +82,6 @@ static bool isEqual(const QList<QAction*>& a, const QList<QAction*>& b) return true; } -<<<<<<< HEAD:src/gui/kernel/qwidget_s60.cpp - void QWidgetPrivate::setSoftKeys_sys(const QList<QAction*> &softkeys) { #ifdef Q_WS_S60 |