fixed conflicts

This commit is contained in:
Jakob.Meier
2021-07-23 18:04:51 +02:00
parent a2e62b28c3
commit 0ce55d5e62
3 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@
#include <fsfw/devicehandlers/DeviceHandlerBase.h>
#include <mission/devices/devicedefinitions/PlocSupervisorDefinitions.h>
#include <cstring>
#include <fsfw_hal/linux/uart/UartComIF.h>
#include <fsfw/hal/linux/uart/UartComIF.h>
/**
* @brief This is the device handler for the supervisor of the PLOC which is programmed by