From 51d265756420e2dca5dc3b5bebf5f89627e5dd81 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Mon, 6 Jun 2011 09:42:19 +0200
Subject: [PATCH] BUG: fix merge error
---
Code/Core/otbWrapperApplication.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Code/Core/otbWrapperApplication.cxx b/Code/Core/otbWrapperApplication.cxx
index 2fa8a5f321..fcc201e599 100644
--- a/Code/Core/otbWrapperApplication.cxx
+++ b/Code/Core/otbWrapperApplication.cxx
@@ -30,10 +30,9 @@ Application::~Application()
{
}
-void Application::Init()
+ParameterGroup* Application::GetParameterList()
{
- m_ParameterList = ParameterGroup::New();
- this->DoCreateParameters();
+ return m_ParameterList;
}
void Application::Init()
--
GitLab