From f635a1e76209ca335d9e3903f5cbab0006c49445 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Mon, 10 Feb 2014 15:25:18 +0100 Subject: [PATCH] Solve merge conflict --- companion/src/firmwares/opentx/opentxeeprom.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index f623905d3..e4056d696 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -1053,7 +1053,7 @@ class LogicalSwitchesFunctionsTable: public ConversionTable { int val=0; bool afterrelease21March2013 = IS_AFTER_RELEASE_21_MARCH_2013(board, version); addConversion(LS_FN_OFF, val++); - if (release21March2013) + if (afterrelease21March2013) addConversion(LS_FN_VEQUAL, val++); addConversion(LS_FN_VPOS, val++); addConversion(LS_FN_VNEG, val++); @@ -1065,11 +1065,11 @@ class LogicalSwitchesFunctionsTable: public ConversionTable { addConversion(LS_FN_XOR, val++); if (IS_ARM(board) && version >= 216) addConversion(LS_FN_STAY, val++); addConversion(LS_FN_EQUAL, val++); - if (!release21March2013) + if (!afterrelease21March2013) addConversion(LS_FN_NEQUAL, val++); addConversion(LS_FN_GREATER, val++); addConversion(LS_FN_LESS, val++); - if (!release21March2013) { + if (!afterrelease21March2013) { addConversion(LS_FN_EGREATER, val++); addConversion(LS_FN_ELESS, val++); }