resolve conflicts

b740129f · yihaoDeng · ae661f7b · b740129f
隐藏空白更改
内联并排

Showing with 0 addition and 3 deletion

src/client/src/tscSystem.c src/client/src/tscSystem.c +0 -3

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