From 55346be5a6fa1a50b139256958e35e6e8f098309 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Mon, 23 Nov 2015 12:35:27 -0800
Subject: [PATCH] Fix bad merge

---
 src/Vehicle/Vehicle.h | 3 ---
 1 file changed, 3 deletions(-)

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