From bc17b5a907ca3fe2ead9829a1a582bedc84389b1 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 5 May 2020 18:43:28 +0200
Subject: [PATCH] resolved conflict

---
 osal/linux/FixedTimeslotTask.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/osal/linux/FixedTimeslotTask.cpp b/osal/linux/FixedTimeslotTask.cpp
index 2775e4f6..098753a7 100644
--- a/osal/linux/FixedTimeslotTask.cpp
+++ b/osal/linux/FixedTimeslotTask.cpp
@@ -42,25 +42,14 @@ uint32_t FixedTimeslotTask::getPeriodMs() const {
 
 ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
 		uint32_t slotTimeMs, int8_t executionStep) {
-<<<<<<< HEAD
-	if (!objectManager->get<ExecutableObjectIF>(componentId)) {
-		sif::error << "Component " << std::hex << componentId
-				   << " not found, not adding it to pst" << std::endl;
-		return HasReturnvaluesIF::RETURN_FAILED;
-	}
-
-	pst.addSlot(componentId, slotTimeMs, executionStep, this);
-	return HasReturnvaluesIF::RETURN_OK;
-=======
 	if (objectManager->get<ExecutableObjectIF>(componentId) != nullptr) {
 		pst.addSlot(componentId, slotTimeMs, executionStep, this);
 		return HasReturnvaluesIF::RETURN_OK;
 	}
 
-	error << "Component " << std::hex << componentId <<
+	sif::error << "Component " << std::hex << componentId <<
 			" not found, not adding it to pst" << std::endl;
 	return HasReturnvaluesIF::RETURN_FAILED;
->>>>>>> luz_FixedTimeslotTask_ExistenceCheck
 }
 
 ReturnValue_t FixedTimeslotTask::checkSequence() const {