fixed conflicts

2022-03-14 14:35:07 +01:00
parent 1133ea08c8 e8ced3c4c4
commit 9fc1e57943
398 changed files with 38751 additions and 31799 deletions
--- a/common/config/commonClassIds.h
+++ b/common/config/commonClassIds.h
@ -26,10 +26,12 @@ enum commonClassIds: uint8_t {
    PLOC_MEMORY_DUMPER, //PLMEMDUMP
    PDEC_HANDLER, //PDEC
    CCSDS_HANDLER, //CCSDS
+    RATE_SETTER, //RS
    ARCSEC_JSON_BASE, //JSONBASE
    NVM_PARAM_BASE, //NVMB
    FILE_SYSTEM_HELPER, //FSHLP
    PLOC_MPSOC_HELPER, // PLMPHLP
+	SA_DEPL_HANDLER, //SADPL
 	COMMON_CLASS_ID_END // [EXPORT] : [END]
 };