fixed merge conflicts
This commit is contained in:
@ -31,6 +31,7 @@ enum: uint8_t {
|
||||
PDU2_HANDLER = 134,
|
||||
ACU_HANDLER = 135,
|
||||
PLOC_SUPV_HELPER = 136,
|
||||
SYRLINKS = 137,
|
||||
COMMON_SUBSYSTEM_ID_END
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user