1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00

Hot fix : wrong conflict resolve in previous merge

This commit is contained in:
Laurent Lalanne 2015-02-24 12:05:34 +01:00
parent aa8dde905e
commit 1cdc00d285

View File

@ -63,7 +63,7 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
UAVSettingsImportExportFactory *importexportplugin = pm->getObject<UAVSettingsImportExportFactory>();
connect(importexportplugin, SIGNAL(importAboutToBegin()), this, SLOT(stopTests()));
connect(ui->channelOutTest, SIGNAL(clicked(bool)), this, SLOT(runChannelTests(bool)));
connect(m_ui->channelOutTest, SIGNAL(clicked(bool)), this, SLOT(runChannelTests(bool)));
// Configure the task widget
// Connect the help button