Merge branch 'joliu-master-patch-60511' into 'master'

Update README.md See merge request xidiancos/Opencps!3

Merge branch 'joliu-master-patch-60511' into 'master'
Update README.md See merge request xidiancos/Opencps!3
ce5cad7f · joliu · 9b65203e · 2b0a0788 · ce5cad7f
Commit ce5cad7f authored Jun 28, 2020 by joliu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

README.md README.md +0 -3

No files found.
--- a/README.md
+++ b/README.md
-<<<<<<< README.md
 # OpenCPS
 ## 无中心式物联网系统

@@ -44,8 +43,6 @@
 1. 构建命令行控制终端，模拟出物联网操作系统的样子
 2. 添加外部直接控制传感器模块的任务模式

-备注 ： 上一次计划未完成，待续
-
 ### 迭代历史
 ##### 2019-3-21