From 96746d0fa4764415f886a6901cabe850a8a68eb5 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 2 Jun 2022 14:41:20 +0800
Subject: [PATCH] fix(client): schemaless fixed format

---
 src/client/src/tscParseLineProtocol.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/client/src/tscParseLineProtocol.c b/src/client/src/tscParseLineProtocol.c
index f38e5a54d3..5a7de5fd5a 100644
--- a/src/client/src/tscParseLineProtocol.c
+++ b/src/client/src/tscParseLineProtocol.c
@@ -2096,13 +2096,8 @@ static int32_t parseSmlValue(TAOS_SML_KV *pKV, const char **index,
           back_slash = false;
           cur++;
           len++;
-<<<<<<< HEAD
           break;
         }
-=======
-	        break;
-	      }
->>>>>>> 307bc006a5435ef382b94eba69ed50b225b483aa
 
         if (*cur == '"') {
           if (cur == *index) {
-- 
GitLab