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