提交 0bc85e16 编写于 作者: S Shengliang Guan

fix conflicts

上级 c98285e0
...@@ -51,8 +51,8 @@ typedef struct SShellArguments { ...@@ -51,8 +51,8 @@ typedef struct SShellArguments {
char file[TSDB_FILENAME_LEN]; char file[TSDB_FILENAME_LEN];
char dir[TSDB_FILENAME_LEN]; char dir[TSDB_FILENAME_LEN];
int threadNum; int threadNum;
char* commands;
int check; int check;
char* commands;
int abort; int abort;
int port; int port;
int pktLen; int pktLen;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册