From 1de23b8b98f951c840e6cc8cc01f4c3cdaec83af Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Mon, 17 Jan 2022 20:03:42 +0800
Subject: [PATCH] merge

---
 source/client/src/clientImpl.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index c53c40f5e3..51f267e884 100644
--- 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 {