ok

2021-08-26 20:46:08 +08:00 · 2021-08-26 20:46:08 +08:00 · 0b6d75f06d
commit 0b6d75f06d
parent 3214775fe9 7de76a2a75
1 changed files with 4 additions and 0 deletions
--- a/start.sh
+++ b/start.sh
@ -3,4 +3,8 @@ git pull
 chmod 777 start.sh

 pm2 delete shizukana
+<<<<<<< HEAD
 pm2 start node --name shizukana -- index
+=======
+pm2 start node --name shizukana -- index
+>>>>>>> 7de76a2a75600de393bda88d8893d31f40a4685c