Fix merge conflict

8b8a55c2 · DonLakeFlyer · 56ad8a7c · 8b8a55c2
Commit 8b8a55c2 authored Apr 16, 2018 by DonLakeFlyer
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

ULogParser.cc src/AnalyzeView/ULogParser.cc +0 -4

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