Fix merge screwup

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;