piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Conflicts fix

Browse Source
This commit is contained in:
mhotar
2014-03-04 21:52:54 +01:00
parent df462447e0
commit b506259d76
5 changed files with 390 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations.cpp
-2
View File
@@ -499,8 +499,6 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text";
const pm_char STR_PREFLIGHT[] PROGMEM = TR_PREFLIGHT;
const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST;
const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE;
const pm_char STR_POT1TYPE[] PROGMEM = TR_POT1TYPE;
const pm_char STR_POT2TYPE[] PROGMEM = TR_POT2TYPE;
const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL;
#endif