merge

1de23b8b · Liu Jicong · d9544f8d · 1de23b8b
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

source/client/src/clientImpl.c source/client/src/clientImpl.c +0 -1

未找到文件。
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -260,7 +260,6 @@ int32_t scheduleQuery(SRequestObj* pRequest, SQueryDag* pDag) {
  return scheduleAsyncExecJob(pRequest->pTscObj->pAppInfo->pTransporter, NULL, pDag, &pRequest->body.pQueryJob);
 }

-<<<<<<<<< Temporary merge branch 1
 typedef struct tmq_t tmq_t;

 typedef struct SMqClientTopic {