Merge fixes

This commit is contained in:
3djc
2018-08-30 13:34:13 +02:00
parent 95c035ed73
commit e97cdd00a8
11 changed files with 32 additions and 16 deletions
+2 -2
View File
@@ -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;