fix(client): schemaless fixed format

96746d0f · Alex Duan · 3dafd178 · 96746d0f
隐藏空白更改
内联并排

Showing with 0 addition and 5 deletion

src/client/src/tscParseLineProtocol.c src/client/src/tscParseLineProtocol.c +0 -5

未找到文件。
--- 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) {