[PATCH 2 of 3] Fix merge errors

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1403703068 -7200
# Node ID 37ffc8ddb698691a97098fe947b9e735fa5f984d
# Parent  0ca15d9374907be422f0355253b24062a0c37833
Fix merge errors

diff -r 0ca15d937490 -r 37ffc8ddb698 ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Wed Jun 25 15:30:58 2014 +0200
+++ b/ui/mainwindow.cpp	Wed Jun 25 15:31:08 2014 +0200
@@ -1069,7 +1069,7 @@
 
 void MainWindow::togglePages(int button)
 {
-    UpdatesPanel->hide();
+    mUpdatesPanel->hide();
     mInstallPanel->hide();
     mRemovePanel->hide();
     mInfoPanel->hide();
@@ -1124,4 +1124,3 @@
         mUpdatesWidget->resize(old.width(), old.height() - mUpdatesManual->height());
     }
 }
->>>>>>> other