summaryrefslogtreecommitdiff
path: root/bin/mctrl_r3
diff options
context:
space:
mode:
Diffstat (limited to 'bin/mctrl_r3')
-rw-r--r--bin/mctrl_r34
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/mctrl_r3 b/bin/mctrl_r3
index 2373dd4..6928cb5 100644
--- a/bin/mctrl_r3
+++ b/bin/mctrl_r3
@@ -11,7 +11,11 @@ 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