Merge remote-tracking branch 'upstream/mueller/master' into development

This commit is contained in:
Robin Müller 2021-01-14 12:22:38 +01:00
commit 4cf15e9ec6

View File

@ -1,7 +1,7 @@
#ifndef FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ #ifndef FSFW_DATAPOOL_POOLREADHELPER_H_
#define FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ #define FSFW_DATAPOOL_POOLREADHELPER_H_
#include "LocalPoolDataSetBase.h" #include "ReadCommitIF.h"
#include "../serviceinterface/ServiceInterface.h" #include "../serviceinterface/ServiceInterface.h"
#include <FSFWConfig.h> #include <FSFWConfig.h>
@ -48,4 +48,4 @@ private:
#endif /* FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ */ #endif /* FSFW_DATAPOOL_POOLREADHELPER_H_ */