diff options
| author | jixinyi <[email protected]> | 2019-01-18 16:37:51 +0800 |
|---|---|---|
| committer | jixinyi <[email protected]> | 2019-01-18 16:37:51 +0800 |
| commit | 2e83f0db5a94ba44cbbcd9d41863215934a738c0 (patch) | |
| tree | 20c25957e655e18308b2ceb1285562874c9b89aa /bin/mctrl_r2 | |
| parent | 6c370f68c7b54973f24558a7f51d6611337fc3e9 (diff) | |
| parent | 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 (diff) | |
重构调用maat新接口
Diffstat (limited to 'bin/mctrl_r2')
| -rw-r--r-- | bin/mctrl_r2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/mctrl_r2 b/bin/mctrl_r2 index 485bd0e..595546b 100644 --- a/bin/mctrl_r2 +++ b/bin/mctrl_r2 @@ -1,4 +1,8 @@ +<<<<<<< HEAD killall mctrl_r3 mctrl +======= +killall mctrl_r3 ir_mctrl +>>>>>>> 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 ./mctrl_r3 &> /dev/null & #./kill_sapp_by_mem.sh &> /dev/null & |