Fix bad merge

55346be5 · Don Gagne · c3a8a992 · 55346be5
Commit 55346be5 authored Nov 23, 2015 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Vehicle.h src/Vehicle/Vehicle.h +0 -3

No files found.
--- 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;