Commit b9005091 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

MainWindow: Manually fix some merge problems

parent e99422b5
......@@ -356,8 +356,7 @@ MainWindow::on_actionSave_As_triggered()
void
MainWindow::on_actionLoad_Project_triggered()
{
GUIProjectManager* pm = GUIProjectManager::getInstance();
pm->loadProject( pm->acquireProjectFileName() );
GUIProjectManager::getInstance()->loadProject();
}
void
......
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