From 3b059a31070638fa62da077345f8078f42b34247 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Mon, 30 Dec 2013 16:44:55 -0800
Subject: [PATCH] Screwed up merge cleanup

---
 qgroundcontrol.pro | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 152f08166..e82d5dde2 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -752,11 +752,8 @@ CONFIG(debug, debug|release) {
         src/qgcunittest/MockUASManager.h \
         src/qgcunittest/MockUAS.h \
         src/qgcunittest/MockQGCUASParamManager.h \
-<<<<<<< HEAD
         src/qgcunittest/MultiSignalSpy.h \
         src/qgcunittest/TCPLinkTest.h \
-=======
->>>>>>> b90a0e96162e58cc5c6f5f5d2e285145cdd75f42
         src/qgcunittest/FlightModeConfigTest.h
 
     SOURCES += \
@@ -764,11 +761,8 @@ CONFIG(debug, debug|release) {
         src/qgcunittest/MockUASManager.cc \
         src/qgcunittest/MockUAS.cc \
         src/qgcunittest/MockQGCUASParamManager.cc \
-<<<<<<< HEAD
         src/qgcunittest/MultiSignalSpy.cc \
         src/qgcunittest/TCPLinkTest.cc \
-=======
->>>>>>> b90a0e96162e58cc5c6f5f5d2e285145cdd75f42
         src/qgcunittest/FlightModeConfigTest.cc
 }
 
-- 
2.22.0