diff options
| author | jixinyi <[email protected]> | 2019-01-21 16:12:13 +0800 |
|---|---|---|
| committer | jixinyi <[email protected]> | 2019-01-21 16:12:13 +0800 |
| commit | 88f7a17eb08c2494ba1b239291918449b842abc7 (patch) | |
| tree | 907770762efa476bbf52fa98332750fa4896efba /bin/mctrl_r2 | |
| parent | 2e83f0db5a94ba44cbbcd9d41863215934a738c0 (diff) | |
调用maat新接口，完善说明文档
Diffstat (limited to 'bin/mctrl_r2')
| -rw-r--r-- | bin/mctrl_r2 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bin/mctrl_r2 b/bin/mctrl_r2 index 595546b..485bd0e 100644 --- a/bin/mctrl_r2 +++ b/bin/mctrl_r2 @@ -1,8 +1,4 @@ -<<<<<<< HEAD killall mctrl_r3 mctrl -======= -killall mctrl_r3 ir_mctrl ->>>>>>> 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 ./mctrl_r3 &> /dev/null & #./kill_sapp_by_mem.sh &> /dev/null & |