Commit c6a9027c authored by Julien Osman's avatar Julien Osman
Browse files

BUG: Miss-merged conflicts

parent e0fa5ca1
......@@ -27,7 +27,6 @@ otbOssimJpegFileResourceLeakTest.cxx
otbOssimElevManagerTest2.cxx
otbOssimElevManagerTest4.cxx
otbDEMHandlerTest.cxx
otbSarSensorModelAdapterTest.cxx
)
add_executable(otbOSSIMAdaptersTestDriver ${OTBOSSIMAdaptersTests})
......
......@@ -27,5 +27,4 @@ void RegisterTests()
REGISTER_TEST(otbOssimElevManagerTest2);
REGISTER_TEST(otbOssimElevManagerTest4);
REGISTER_TEST(otbDEMHandlerTest);
REGISTER_TEST(otbSarSensorModelAdapterTest);
}
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