From 997f41c85424273b4294edb02e3db1d141697cab Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Mon, 13 Feb 2023 14:05:53 +0800
Subject: [PATCH] fix:conflict from 3.0

---
 source/client/src/clientRawBlockWrite.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c
index 191d028cec..a12f94cf1d 100644
--- a/source/client/src/clientRawBlockWrite.c
+++ b/source/client/src/clientRawBlockWrite.c
@@ -694,11 +694,7 @@ static int32_t taosCreateStb(TAOS* taos, void* meta, int32_t metaLen) {
   pReq.numOfColumns = req.schemaRow.nCols;
   pReq.numOfTags = req.schemaTag.nCols;
   pReq.commentLen = -1;
-<<<<<<< HEAD
-  pReq.suid = processSuid(req.suid, pRequest->pDb);;
-=======
   pReq.suid = processSuid(req.suid, pRequest->pDb);
->>>>>>> 6483b92f0c645b36facfb2f3415b8df9449264cf
   pReq.source = TD_REQ_FROM_TAOX;
   pReq.igExists = true;
 
-- 
GitLab