Merge conflicts.

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

gui/resultstree.cpp

@@ -77,10 +77,7 @@ void ResultsTree::AddErrorItem(const QString &file,
     }
 }
 
-<<<<<<< HEAD:gui/resultstree.cpp
 
-=======
->>>>>>> gui:gui/resultstree.cpp
 ShowTypes ResultsTree::SeverityToShowType(const QString & severity)
 {
     if (severity == "all")