diff options
| author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
|---|---|---|
| committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
| commit | 601ebdf6c4faea76016cf0d87d50abc260ca1569 (patch) | |
| tree | cf601630c933447f2a369f6245f9a04b9a46b08a /src/mainview.cpp | |
| parent | Typographical and grammar corrections (diff) | |
| parent | EBN Krazy fixes. 1st round.. (diff) | |
| download | rekonq-601ebdf6c4faea76016cf0d87d50abc260ca1569.tar.xz | |
Fixing conflicts merging master
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/mainview.cpp')
| -rw-r--r-- | src/mainview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp index d4edeb19..71f81d66 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -213,7 +213,7 @@ void MainView::clear() // clear the line edit history for (int i = 0; i < m_urlBars->count(); ++i) { - /// TODO What exacly do we need to clear here? + /// TODO What exactly do we need to clear here? urlBar(i)->clearHistory(); urlBar(i)->clear(); } @@ -713,4 +713,8 @@ void MainView::mouseDoubleClickEvent(QMouseEvent *event) return; } KTabWidget::mouseDoubleClickEvent(event); -}
\ No newline at end of file +<<<<<<< HEAD:src/mainview.cpp +} +======= +} +>>>>>>> master:src/mainview.cpp |