Update README.md

123
Merge branch 'master' of https://bdgit.educoder.net/plebkff6w/text2
1 changed files with 7 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -1,8 +1,13 @@
 # 学生成绩管理系统

-## 项目简介

+## 
+.....

+<<<<<<< HEAD

 jj
-ok
+ok
+=
+![信息排序流程图](images/sort_data.drawio.svg)
+
Author	SHA1	Message	Date
plebkff6w	7b212fc679	Update README.md	2 years ago
yuankaihao	9689784ecc	123	2 years ago
bo yu	768730015e	Merge branch 'master' of https://bdgit.educoder.net/plebkff6w/text2	2 years ago
xiao dong	2589a5f37a	Merge branch 'b1'	2 years ago
xiao dong	ac40be4705	123	2 years ago
plebkff6w	38ebdec88e	Merge pull request 'xiugai' (#1 ) from b1 into master	2 years ago
xiao dong	3e607b66ec	b1	2 years ago
yuankaihao	4868afc1b9	123	2 years ago
yuankaihao	48f8012e17	Merge branch 'master' of https://bdgit.educoder.net/plebkff6w/text2	2 years ago
yuankaihao	e85afcb482	44	2 years ago