From: Andrea Manni <andrea@piffa.net>
Date: Sun, 5 Feb 2017 01:30:22 +0000 (+0100)
Subject: ERRATA
X-Git-Url: http://git.piffa.net/web?a=commitdiff_plain;h=5f697c1ee0d74574fd34f214d0a490d4695f0dd8;p=aerei

ERRATA
---

diff --git a/esempi/ailerons_state_rgb/ailerons_state_rgb.ino b/esempi/ailerons_state_rgb/ailerons_state_rgb.ino
index f83dda6..1759067 100644
--- 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;