From 855dda69b7dbb2ef2a59ff01a61959875521a8f6 Mon Sep 17 00:00:00 2001
From: Vesa Pikki <spyree@gmail.com>
Date: Sun, 22 Mar 2009 19:40:29 +0200
Subject: [PATCH] Conflicts:

	gui/mainwindow.cpp
	gui/resultstree.cpp
---
 gui/mainwindow.cpp  | 3 +++
 gui/resultstree.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index a8d2ae4cf..3f20e7bc5 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -292,4 +292,7 @@ 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 559fb1b84..a32a48f87 100644
--- a/gui/resultstree.cpp
+++ b/gui/resultstree.cpp
@@ -77,7 +77,10 @@ void ResultsTree::AddErrorItem(const QString &file,
     }
 }
 
+<<<<<<< HEAD:gui/resultstree.cpp
 
+=======
+>>>>>>> gui:gui/resultstree.cpp
 ShowTypes ResultsTree::SeverityToShowType(const QString &severity)
 {
     if (severity == "all")