Merge fixes
This commit is contained in:
@@ -582,8 +582,8 @@ const char STR_BLCOLOR[] = TR_BLCOLOR;
|
||||
const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION;
|
||||
const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1;
|
||||
const char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2;
|
||||
const char STR_R9MFLEXWARN1[] PROGMEM = TR_R9MFLEXWARN1;
|
||||
const char STR_R9MFLEXWARN2[] PROGMEM = TR_R9MFLEXWARN2;
|
||||
const char STR_R9MFLEXWARN1[] = TR_R9MFLEXWARN1;
|
||||
const char STR_R9MFLEXWARN2[] = TR_R9MFLEXWARN2;
|
||||
const char STR_SET[] = TR_SET;
|
||||
const char STR_PREFLIGHT[] = TR_PREFLIGHT;
|
||||
const char STR_CHECKLIST[] = TR_CHECKLIST;
|
||||
|
||||
Reference in New Issue
Block a user