From 1e66d7f0e44949fc56e57b93cf1c106b736a363e Mon Sep 17 00:00:00 2001
From: Vesa Pikki <spyree@gmail.com>
Date: Sun, 22 Mar 2009 19:41:32 +0200
Subject: [PATCH] Merge conflicts.

---
 gui/mainwindow.cpp  | 4 ----
 gui/resultstree.cpp | 5 +----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 3f20e7bc5..74051a2aa 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -292,7 +292,3 @@ void MainWindow::ShowErrors(bool checked)
 {
     mResults.ShowResults(SHOW_ERRORS, checked);
 }
-<<<<<<< HEAD:gui/mainwindow.cpp
-
-=======
->>>>>>> gui:gui/mainwindow.cpp
diff --git a/gui/resultstree.cpp b/gui/resultstree.cpp
index a32a48f87..574546030 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -77,11 +77,8 @@ void ResultsTree::AddErrorItem(const QString &file,
     }
 }
 
-<<<<<<< HEAD:gui/resultstree.cpp
 
-=======
->>>>>>> gui:gui/resultstree.cpp
-ShowTypes ResultsTree::SeverityToShowType(const QString &severity)
+ShowTypes ResultsTree::SeverityToShowType(const QString & severity)
 {
     if (severity == "all")
         return SHOW_ALL;