fix conflicts

This commit is contained in:
Shengliang Guan 2021-03-25 03:33:23 +00:00
parent c98285e05c
commit 0bc85e1655
1 changed files with 1 additions and 1 deletions

View File

@ -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;