changeset 657:37ffc8ddb698

Fix merge errors
author Andre Heinecke <andre.heinecke@intevation.de>
date Wed, 25 Jun 2014 15:31:08 +0200
parents 0ca15d937490
children ac5c0ad4dd04
files ui/mainwindow.cpp
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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

http://wald.intevation.org/projects/trustbridge/