Merge branch 'master' of

http://82.156.111.58:3000/maojian/crawltaskmanager.git
6 months ago · acb48e8a5a
1 changed files with 6 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1 +1,7 @@
+<<<<<<< HEAD
 采集任务管理应用
+=======
+# crawltaskmanager
+
+网站数据采集应用管理
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/crawltaskmanager.git