From 62fbb62b9ce036ab47c148f5a162df8c0e482567 Mon Sep 17 00:00:00 2001
From: xsren <285808407@qq.com>
Date: Tue, 29 Oct 2024 23:06:57 +0800
Subject: [PATCH] fix: merge conflict

---
 source/libs/command/src/command.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source/libs/command/src/command.c b/source/libs/command/src/command.c
index 2f44da6c4f..6272ac7049 100644
--- a/source/libs/command/src/command.c
+++ b/source/libs/command/src/command.c
@@ -52,8 +52,6 @@ static int32_t buildRetrieveTableRsp(SSDataBlock* pBlock, int32_t numOfCols, SRe
 
   int32_t len = blockEncode(pBlock, (*pRsp)->data + PAYLOAD_PREFIX_LEN, dataEncodeBufSize, numOfCols);
   if(len < 0) {
-  int32_t len = blockEncode(pBlock, (*pRsp)->data + PAYLOAD_PREFIX_LEN, dataEncodeBufSize, numOfCols);
-  if (len < 0) {
     taosMemoryFree(*pRsp);
     return terrno;
   }