Skip to content

Commit

Permalink
fix merge conflict for nasa/cFE#1915
Browse files Browse the repository at this point in the history
  • Loading branch information
@astrogeco
astrogeco committed Sep 10, 2021
1 parent 7bd5a02 commit 50b0d61
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 18 files
+18 −1 .github/workflows/code-coverage.yml
+13 −3 README.md
+179 −58 docs/cFE Application Developers Guide.md
+ − docs/media/cFE_Application_Developers_Guide_image10.png
+ − docs/media/cFE_Application_Developers_Guide_image11.png
+ − docs/media/cFE_Application_Developers_Guide_image5.png
+ − docs/media/cFE_Application_Developers_Guide_image6.png
+ − docs/media/cFE_Application_Developers_Guide_image7.png
+ − docs/media/cFE_Application_Developers_Guide_image8.png
+ − docs/media/cFE_Application_Developers_Guide_image9.png
+32 −13 modules/cfe_testcase/src/msg_api_test.c
+6 −1 modules/cfe_testcase/src/sb_sendrecv_test.c
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+1 −0 modules/core_private/ut-stubs/inc/ut_osprintf_stubs.h
+1 −0 modules/core_private/ut-stubs/src/ut_osprintf_stubs.c
+633 −58 modules/es/ut-coverage/es_UT.c
+123 −4 modules/sb/ut-coverage/sb_UT.c
+16 −0 modules/sb/ut-coverage/sb_UT.h

0 comments on commit 50b0d61

Please sign in to comment.