diff options
| author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:59:13 +0000 |
|---|---|---|
| committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:59:13 +0000 |
| commit | 9d0b48c6b16dc00096e828f31bb88ff9cfd43689 (patch) | |
| tree | 63741236fe7b30f026ca2ae3a4a350d84a71521d /src/mainview.cpp | |
| parent | updated TODO (diff) | |
| download | rekonq-9d0b48c6b16dc00096e828f31bb88ff9cfd43689.tar.xz | |
Fixing forgotten merging issues..
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964617 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/mainview.cpp')
| -rw-r--r-- | src/mainview.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
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 |