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 {