From 8004616a52cd39fc08cd3210ff27258ba337ebfa Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 8 Mar 2024 09:12:57 +0000
Subject: [PATCH] Merge branch 'feature/compressData' of
 https://github.com/taosdata/TDengine into feature/compressData

---
 source/common/src/tmsg.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 481c15c919..c19d759171 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -7644,16 +7644,11 @@ int tEncodeSVCreateTbReq(SEncoder *pCoder, const SVCreateTbReq *pReq) {
     if (tEncodeI32(pCoder, pReq->sqlLen) < 0) return -1;
     if (tEncodeBinary(pCoder, pReq->sql, pReq->sqlLen) < 0) return -1;
   }
-<<<<<<< HEAD
+  // Encode Column Options: encode compress level
   if (pReq->type == TSDB_SUPER_TABLE || pReq->type == TSDB_NORMAL_TABLE) {
     if (tEncodeSColCmprWrapper(pCoder, &pReq->colCmpr) < 0) return -1;
   }
 
-  // Encode Column Options: encode compress level
-
-=======
-  if (tEncodeSColCmprWrapper(pCoder, &pReq->colCmpr) < 0) return -1;
->>>>>>> cbd4dc2961a37ce1e04a9b609d3549fbee31ab61
   tEndEncode(pCoder);
   return 0;
 }