ERRATA

[aerei] / esempi / ailerons_state_rgb / ailerons_state_rgb.ino

diff --git a/esempi/ailerons_state_rgb/ailerons_state_rgb.ino b/esempi/ailerons_state_rgb/ailerons_state_rgb.ino
index f83dda60f274ac9f1f01c96047f008e5ce28286e..17590671a7de21dba50f0f93c7083db222a781a0 100644 (file)
--- a/esempi/ailerons_state_rgb/ailerons_state_rgb.ino
+++ b/esempi/ailerons_state_rgb/ailerons_state_rgb.ino
@@ -132,10 +132,7 @@ sxin:
             ailstate = middle;
         }
         else if (ail < mid_point - deviation) {
-<<<<<<< HEAD
             now = millis() ;
-=======
->>>>>>> 5b38ddfa00f7c92607b220adc874107fba2bda0e
             ailstate = dxin;
         } ;
         break;
@@ -156,10 +153,7 @@ dxin:
             ailstate = middle;
         }
         else if (ail > mid_point + deviation) {
-<<<<<<< HEAD
             now = millis() ;
-=======
->>>>>>> 5b38ddfa00f7c92607b220adc874107fba2bda0e
             ailstate = dxin;
         } ;
         break;