eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

resolve merge conflict
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2023-02-20 19:38:41 +01:00
parent cac634503d
commit fb0ff922a8
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mission/tmtc/CfdpTmFunnel.cpp
View File

@ -80,15 +80,9 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
msg.setStorageId(storeId); msg.setStorageId(storeId);
} else { } else {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #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 " sif::error << "PusTmFunnel::handlePacket: Store too full to create data copy or store "
"error" "error" << std::endl;
<< std::endl;
break; break;
>>>>>>> Stashed changes
#endif #endif
} }
} else { } else {