From af4868552cae9438106cbab36e94c280509ab8f1 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Mon, 29 Sep 2014 12:38:35 -0700
Subject: [PATCH] Fix merge screwup

---
 src/uas/QGCUASFileManager.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/uas/QGCUASFileManager.cc b/src/uas/QGCUASFileManager.cc
index f8b1013..ed459d2 100644
--- a/src/uas/QGCUASFileManager.cc
+++ b/src/uas/QGCUASFileManager.cc
@@ -161,7 +161,6 @@ void QGCUASFileManager::_listAckResponse(Request* listAck)
         uint8_t cBytesLeft = cBytes - offset;
         uint8_t nlen = static_cast<uint8_t>(strnlen(ptr, cBytesLeft));
         if ((*ptr == 'S' && nlen > 1) || (*ptr != 'S' && nlen < 2)) {
-        if (nlen < 2) {
             _currentOperation = kCOIdle;
             _emitErrorMessage(tr("Incorrectly formed list entry: '%1'").arg(ptr));
             return;