fixed merge conflicts

2021-07-23 17:48:11 +02:00
parent 0cc454d891 62fe0571b1
commit a2e62b28c3
70 changed files with 1597 additions and 606 deletions
--- a/common/config/commonSubsystemIds.h
+++ b/common/config/commonSubsystemIds.h
@ -16,6 +16,7 @@ enum: uint8_t {
 	RW_HANDLER = 113,
 	STR_HANDLER = 114,
 	PLOC_SUPERVISOR_HANDLER = 115,
+	FILE_SYSTEM = 116,
 	COMMON_SUBSYSTEM_ID_END
 };
 }