From 8b8a55c20ac7e89d0117aa0ad18871e0a4accba2 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Mon, 16 Apr 2018 11:33:49 -0700
Subject: [PATCH] Fix merge conflict

---
 src/AnalyzeView/ULogParser.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/AnalyzeView/ULogParser.cc b/src/AnalyzeView/ULogParser.cc
index ebe76dd3b..d6b7f365e 100644
--- a/src/AnalyzeView/ULogParser.cc
+++ b/src/AnalyzeView/ULogParser.cc
@@ -177,11 +177,7 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
     }
 
     if (cameraFeedback.count() == 0) {
-<<<<<<< HEAD
-        qWarning() << "Could not detect camera_capture packets in ULog";
-=======
         errorMessage = tr("Could not detect camera_capture packets in ULog");
->>>>>>> b4f4085c6733b934358b00389d734600eab87bf7
         return false;
     }
 
-- 
2.22.0