From 0195cf12db69cda1599ecec30bdb1e3980cff49c Mon Sep 17 00:00:00 2001
From: Valerio Mariani <valerio.mariani@unibas.ch>
Date: Wed, 2 May 2012 11:14:33 +0200
Subject: [PATCH] Fixed incomplete manual merge
---
modules/gui/src/panels/panel_bar.cc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/modules/gui/src/panels/panel_bar.cc b/modules/gui/src/panels/panel_bar.cc
index 7a93df5ff..81312afb1 100644
--- a/modules/gui/src/panels/panel_bar.cc
+++ b/modules/gui/src/panels/panel_bar.cc
@@ -60,14 +60,11 @@ PanelBar::PanelBar(QWidget* parent) :
connect(show_action_, SIGNAL(triggered(bool)), this,
SLOT(ShowActionTrigger()));
this->addAction(show_action_);
-<<<<<<< HEAD
-=======
}
PanelBar::~PanelBar()
{
delete drop_box_; // manually destroy drop_box_ widget, as it has no parent.
->>>>>>> develop
}
void PanelBar::AddWidget(Widget* widget, bool is_hidden)
--
GitLab