Commit 1618abfc authored by Melroy van den Berg's avatar Melroy van den Berg

Fix merge conflict

parent e63edd30
Pipeline #2519 passed with stages
in 1 minute and 48 seconds
......@@ -94,11 +94,7 @@ void SignalDispatcher::DispatchSignals()
menu.give_feedback.connect(sigc::mem_fun(*mainWindow, &MainWindow::on_give_feedback));
menu.show_about.connect(sigc::mem_fun(about, &AboutDialog::run_dialog));
about.signal_response().connect(sigc::mem_fun(about, &AboutDialog::hide_dialog));
<<<<<<< HEAD
=======
>>>>>>> master
// Distribute the active bottle signal
mainWindow->activeBottle.connect(sigc::mem_fun(manager, &BottleManager::SetActiveBottle));
mainWindow->activeBottle.connect(sigc::mem_fun(editWindow, &EditWindow::SetActiveBottle));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment