fixed merge conflicts

2022-03-25 18:49:34 +01:00
parent 4bf0521a5d 15d1da8199
commit 2f6d9ab7f1
67 changed files with 2539 additions and 340 deletions
--- a/common/config/commonSubsystemIds.h
+++ b/common/config/commonSubsystemIds.h
@ -21,6 +21,9 @@ enum: uint8_t {
 	STR_HELPER = 120,
 	PLOC_MPSOC_HELPER = 121,
 	PL_PCDU_HANDLER = 121,
+	ACS_BOARD_ASS = 122,
+	SUS_BOARD_ASS = 123,
+	TCS_BOARD_ASS = 124,
 	COMMON_SUBSYSTEM_ID_END
 };
 }