From b7f2fe76d0c8c602ded0d7c6f2a6a7475304b411 Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Thu, 12 Nov 2015 23:59:42 -0500
Subject: [PATCH] Fixing merge conflict.

---
 qgroundcontrol.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 95d9b3192..ad837923c 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -509,6 +509,7 @@ SOURCES += \
     src/qgcunittest/TCPLinkTest.cc \
     src/qgcunittest/TCPLoopBackServer.cc \
     src/qgcunittest/UnitTest.cc \
+    src/qgcunittest/UnitTestList.cc \
     src/VehicleSetup/SetupViewTest.cc \
 } # DebugBuild|WindowsDebugAndRelease
 } # MobileBuild
-- 
2.22.0