Skip to content
Snippets Groups Projects
Commit 51d26575 authored by Julien Malik's avatar Julien Malik
Browse files

BUG: fix merge error

parent 27d0b81c
No related branches found
No related tags found
No related merge requests found
......@@ -30,10 +30,9 @@ Application::~Application()
{
}
void Application::Init()
ParameterGroup* Application::GetParameterList()
{
m_ParameterList = ParameterGroup::New();
this->DoCreateParameters();
return m_ParameterList;
}
void Application::Init()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment