From fb0ff922a8541818b72afa22f7926b4bc27c76de Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 20 Feb 2023 19:38:41 +0100
Subject: [PATCH] resolve merge conflict

---
 mission/tmtc/CfdpTmFunnel.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/mission/tmtc/CfdpTmFunnel.cpp b/mission/tmtc/CfdpTmFunnel.cpp
index 60479cf8..bb5fd794 100644
--- a/mission/tmtc/CfdpTmFunnel.cpp
+++ b/mission/tmtc/CfdpTmFunnel.cpp
@@ -80,15 +80,9 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
           msg.setStorageId(storeId);
         } else {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-<<<<<<< Updated upstream
-          sif::error << "PusTmFunnel::handlePacket: Store too full to create data copy"
-                     << std::endl;
-=======
           sif::error << "PusTmFunnel::handlePacket: Store too full to create data copy or store "
-                        "error"
-                     << std::endl;
+                        "error" << std::endl;
           break;
->>>>>>> Stashed changes
 #endif
         }
       } else {