bsp_hosted/ObjectFactory.cpp

@@ -43,12 +43,8 @@
 #include <dummies/SusDummy.h>
 #include <dummies/SyrlinksDummy.h>
 #include <dummies/TemperatureSensorsDummy.h>
-
-<<<<<<< HEAD
 #include "dummies/helpers.h"
-=======
 #include "mission/utility/GlobalConfigHandler.h"
->>>>>>> origin/develop
 
 void Factory::setStaticFrameworkObjectIds() {
   PusServiceBase::PUS_DISTRIBUTOR = objects::PUS_PACKET_DISTRIBUTOR;