fix one merge conflict

2022-10-10 10:26:26 +02:00 · 2022-10-10 10:26:26 +02:00 · f4cceeb21e
commit f4cceeb21e
parent 50d41215fa
1 changed files with 0 additions and 4 deletions
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/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;