add four xingqufen tag

c242ff22 · 谢祁峰 · 5a16a12d · fe8ae258 · c242ff22 · c242ff22
Commit c242ff22 authored Oct 16, 2019 by 谢祁峰
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Makefile Makefile +3 -0

README.md README.md +3 -0

No files found.
--- a/Makefile
+++ b/Makefile
 crontab:
 	cp crontab.py  /data/log/physical/app/crontab.py && python /data/log/physical/app/crontab.py && python  /data/log/physical/app/crontabs.py
+<<<<<<< HEAD

+=======
+>>>>>>> fe8ae25876e5baba8581e3a79f5440c3f7f21dca
 celery:
 	celery -A physical worker -c 1 -Q vest -l debug
--- a/README.md
+++ b/README.md
@@ -56,7 +56,10 @@ celery -A physical beat
 ### physical策略端脚本
 在Alp-Test-Cos-test001服务器上，通过crontab -l查看

+<<<<<<< HEAD
 更新脚本
 ```bash
 make crontab
 ```
+=======
+>>>>>>> fe8ae25876e5baba8581e3a79f5440c3f7f21dca