From b740129fcf19a7fb97f8afd40bdcff1835cb4519 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Sun, 3 Jan 2021 13:20:56 +0000
Subject: [PATCH] resolve conflicts

---
 src/client/src/tscSystem.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index ac68d6e31d..27d23b8ee5 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -223,7 +223,6 @@ void taos_cleanup(void) {
 
   taosCleanupKeywordsTable();
   taosCloseLog();
-<<<<<<< HEAD
 
   m = tscRpcCache; 
   if (m != NULL && atomic_val_compare_exchange_ptr(&tscRpcCache, m, 0) == m) {
@@ -235,8 +234,6 @@ void taos_cleanup(void) {
   }
 
   if (tscEmbedded == 0) rpcCleanup();
-=======
->>>>>>> ca3888c190d0415c151964a89652811e37089afd
 
   if (tscEmbedded == 0) {
     rpcCleanup();
-- 
GitLab