summaryrefslogtreecommitdiff
path: root/bin/mctrl_r3
diff options
context:
space:
mode:
authorjixinyi <[email protected]>2019-01-21 16:12:13 +0800
committerjixinyi <[email protected]>2019-01-21 16:12:13 +0800
commit88f7a17eb08c2494ba1b239291918449b842abc7 (patch)
tree907770762efa476bbf52fa98332750fa4896efba /bin/mctrl_r3
parent2e83f0db5a94ba44cbbcd9d41863215934a738c0 (diff)
调用maat新接口,完善说明文档
Diffstat (limited to 'bin/mctrl_r3')
-rw-r--r--bin/mctrl_r34
1 files changed, 0 insertions, 4 deletions
diff --git a/bin/mctrl_r3 b/bin/mctrl_r3
index 6928cb5..2373dd4 100644
--- a/bin/mctrl_r3
+++ b/bin/mctrl_r3
@@ -11,11 +11,7 @@ while [ 1 ]; do
ulimit -c 0
fi
-<<<<<<< HEAD
./mctrl > /dev/null
-=======
- ./ir_mctrl > /dev/null
->>>>>>> 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4
echo program crashed, restart at `date +"%w %Y/%m/%d, %H:%M:%S"` >> RESTART.log
sleep 10
done