From 9d0b48c6b16dc00096e828f31bb88ff9cfd43689 Mon Sep 17 00:00:00 2001
From: adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 6 May 2009 23:59:13 +0000
Subject: Fixing forgotten merging issues..

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964617 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/mainview.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/mainview.cpp')

diff --git a/src/mainview.cpp b/src/mainview.cpp
index 71f81d66..5432fa51 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -713,8 +713,4 @@ void MainView::mouseDoubleClickEvent(QMouseEvent *event)
         return;
     }
     KTabWidget::mouseDoubleClickEvent(event);
-<<<<<<< HEAD:src/mainview.cpp
 }
-=======
-}
->>>>>>> master:src/mainview.cpp
-- 
cgit v1.2.1