removed conflict markers

2020-05-15 21:14:21 +02:00 · 2020-05-15 21:14:21 +02:00 · ebcc4742a9
parent abdf04ce79
commit ebcc4742a9
1 changed files with 0 additions and 4 deletions
--- a/osal/FreeRTOS/FixedTimeslotTask.cpp
+++ b/osal/FreeRTOS/FixedTimeslotTask.cpp
@ -57,10 +57,6 @@ ReturnValue_t FixedTimeslotTask::startTask() {

 ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
 		uint32_t slotTimeMs, int8_t executionStep) {
-<<<<<<< HEAD
-=======
-
->>>>>>> mueller_framework
 	if (objectManager->get<ExecutableObjectIF>(componentId) != nullptr) {
 		if(slotTimeMs == 0) {
 			// FreeRTOS throws a sanity error for zero values, so we set