From c3a8a992474e7ebe60fafcdbfd7fa7eb176b1d4b Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Tue, 17 Nov 2015 16:05:53 -0800
Subject: [PATCH] Auto connect support

- Pervasive change to automatically connect to known board types
- Lots of additional changes along with this:
- More exposure of objects/properties to Qml
- Much restructuring in LinkManager and LinkManager clients
---
 src/Vehicle/Vehicle.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index 823af1a9a..196810aa9 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -402,7 +402,10 @@ private:
     int             _satelliteCount;
     int             _satelliteLock;
     int             _updateCount;
+<<<<<<< 39349c942a94b1a2714e3fb8818b82c455779861
     QString         _formatedMessage;
+=======
+>>>>>>> Auto connect support
     int             _rcRSSI;
     double          _rcRSSIstore;
 
-- 
2.22.0