fixed merge conflicts

2021-07-23 14:36:15 +02:00
parent 3b1b417e79 bda4dad22b
commit 97f36a6ac7
46 changed files with 1648 additions and 351 deletions
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@ -83,9 +83,4 @@ void ObjectFactory::produceGenericObjects() {
            pus::PUS_SERVICE_20);
    new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT,
            apid::EIVE_OBSW, pus::PUS_SERVICE_200);
-
-    /* Test Device Handler */
-#if OBSW_ADD_TEST_CODE == 1
-    new TestTask(objects::TEST_TASK);
-#endif
 }