fix one merge conflict
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head This commit looks good

This commit is contained in:
Robin Müller 2022-10-10 10:26:26 +02:00
parent 50d41215fa
commit f4cceeb21e
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814

View File

@ -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;