From a5e20657c6eb22043c4313a00fd4c4f4bcf2e98a Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 14 Jan 2021 11:31:26 +0100
Subject: [PATCH] resolved merge conflicts

---
 datapoollocal/LocalPoolVariable.tpp | 55 -----------------------------
 pus/CMakeLists.txt                  |  1 -
 2 files changed, 56 deletions(-)

diff --git a/datapoollocal/LocalPoolVariable.tpp b/datapoollocal/LocalPoolVariable.tpp
index 7eea2a46..35de4ebd 100644
--- a/datapoollocal/LocalPoolVariable.tpp
+++ b/datapoollocal/LocalPoolVariable.tpp
@@ -32,37 +32,6 @@ inline ReturnValue_t LocalPoolVariable<T>::read(
 
 template<typename T>
 inline ReturnValue_t LocalPoolVariable<T>::readWithoutLock() {
-<<<<<<< HEAD
-	if(readWriteMode == pool_rwm_t::VAR_WRITE) {
-		object_id_t targetObjectId = hkManager->getOwner()->getObjectId();
-		reportReadCommitError("LocalPoolVector",
-				PoolVariableIF::INVALID_READ_WRITE_MODE, true, targetObjectId,
-				localPoolId);
-		return PoolVariableIF::INVALID_READ_WRITE_MODE;
-	}
-
-	PoolEntry<T>* poolEntry = nullptr;
-	ReturnValue_t result = hkManager->fetchPoolEntry(localPoolId, &poolEntry);
-	if(result != RETURN_OK) {
-		object_id_t ownerObjectId = hkManager->getOwner()->getObjectId();
-		reportReadCommitError("LocalPoolVariable", result,
-				false, ownerObjectId, localPoolId);
-		return result;
-	}
-
-	// Actually this should never happen..
-	if(poolEntry->address == nullptr) {
-		result = PoolVariableIF::INVALID_POOL_ENTRY;
-		object_id_t ownerObjectId = hkManager->getOwner()->getObjectId();
-		reportReadCommitError("LocalPoolVariable", result,
-				false, ownerObjectId, localPoolId);
-		return result;
-	}
-
-	this->value = *(poolEntry->address);
-	this->valid = poolEntry->valid;
-	return RETURN_OK;
-=======
     if(readWriteMode == pool_rwm_t::VAR_WRITE) {
         object_id_t targetObjectId = hkManager->getCreatorObjectId();
         reportReadCommitError("LocalPoolVector",
@@ -94,7 +63,6 @@ inline ReturnValue_t LocalPoolVariable<T>::readWithoutLock() {
     this->value = *(poolEntry->getDataPtr());
     this->valid = poolEntry->getValid();
     return RETURN_OK;
->>>>>>> upstream/mueller/master
 }
 
 template<typename T>
@@ -113,28 +81,6 @@ inline ReturnValue_t LocalPoolVariable<T>::commit(
 
 template<typename T>
 inline ReturnValue_t LocalPoolVariable<T>::commitWithoutLock() {
-<<<<<<< HEAD
-	if(readWriteMode == pool_rwm_t::VAR_READ) {
-		object_id_t targetObjectId = hkManager->getOwner()->getObjectId();
-		reportReadCommitError("LocalPoolVector",
-				PoolVariableIF::INVALID_READ_WRITE_MODE, false, targetObjectId,
-				localPoolId);
-		return PoolVariableIF::INVALID_READ_WRITE_MODE;
-	}
-
-	PoolEntry<T>* poolEntry = nullptr;
-	ReturnValue_t result = hkManager->fetchPoolEntry(localPoolId, &poolEntry);
-	if(result != RETURN_OK) {
-		object_id_t ownerObjectId = hkManager->getOwner()->getObjectId();
-		reportReadCommitError("LocalPoolVariable", result,
-				false, ownerObjectId, localPoolId);
-		return result;
-	}
-
-	*(poolEntry->address) = this->value;
-	poolEntry->valid = this->valid;
-	return RETURN_OK;
-=======
     if(readWriteMode == pool_rwm_t::VAR_READ) {
         object_id_t targetObjectId = hkManager->getCreatorObjectId();
         reportReadCommitError("LocalPoolVector",
@@ -157,7 +103,6 @@ inline ReturnValue_t LocalPoolVariable<T>::commitWithoutLock() {
     *(poolEntry->getDataPtr()) = this->value;
     poolEntry->setValid(this->valid);
     return RETURN_OK;
->>>>>>> upstream/mueller/master
 }
 
 template<typename T>
diff --git a/pus/CMakeLists.txt b/pus/CMakeLists.txt
index c0e00448..758c2629 100644
--- a/pus/CMakeLists.txt
+++ b/pus/CMakeLists.txt
@@ -5,7 +5,6 @@ target_sources(${LIB_FSFW_NAME}
 		Service17Test.cpp
 		Service1TelecommandVerification.cpp
 		Service2DeviceAccess.cpp
-		Service3Housekeeping.cpp
 		Service5EventReporting.cpp
 		Service8FunctionManagement.cpp
 		Service9TimeManagement.cpp