From 2c1399aace79ce018dd95360e49f33e2bf0f27eb Mon Sep 17 00:00:00 2001
From: Frans Englich <frans.englich@nokia.com>
Date: Wed, 23 Sep 2009 16:34:23 +0200
Subject: Fix merge error.

---
 src/gui/kernel/qwidget_s60.cpp | 2 --
 1 file changed, 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
-- 
cgit v0.12