From 0bc85e16553b161ea83251bc6d4044674d3888ef Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 25 Mar 2021 03:33:23 +0000
Subject: [PATCH] fix conflicts

---
 src/kit/shell/inc/shell.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kit/shell/inc/shell.h b/src/kit/shell/inc/shell.h
index c403bd3de8..bbd64a6f82 100644
--- a/src/kit/shell/inc/shell.h
+++ b/src/kit/shell/inc/shell.h
@@ -51,8 +51,8 @@ typedef struct SShellArguments {
   char  file[TSDB_FILENAME_LEN];
   char  dir[TSDB_FILENAME_LEN];
   int   threadNum;
-  char* commands;
   int   check;
+  char* commands;
   int   abort;
   int   port;
   int   pktLen;