fix conflicts

0bc85e16 · Shengliang Guan · c98285e0 · 0bc85e16
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

src/kit/shell/inc/shell.h src/kit/shell/inc/shell.h +1 -1

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