Resolve confict
This commit is contained in:
parent
42fa95c2d0
commit
10605e00b9
|
@ -62,6 +62,7 @@ const char * const ownerNames[OWNER_TOTAL_COUNT] = {
|
|||
"TRANSPONDER",
|
||||
"VTX",
|
||||
"COMPASS_CS",
|
||||
"SPI_PREINIT",
|
||||
"RX_BIND_PLUG",
|
||||
};
|
||||
|
||||
|
|
|
@ -62,6 +62,7 @@ typedef enum {
|
|||
OWNER_TRANSPONDER,
|
||||
OWNER_VTX,
|
||||
OWNER_COMPASS_CS,
|
||||
OWNER_SPI_PREINIT,
|
||||
OWNER_RX_BIND_PLUG,
|
||||
OWNER_TOTAL_COUNT
|
||||
} resourceOwner_e;
|
||||
|
|
Loading…
Reference in New Issue