初始提交

提交说明
最初版
7 changed files with 5002 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -3,3 +3,4 @@
 - src为源代码文件
 - doc为作业文档
 123
--- a/doc/泛读报告/泛读报告.md
+++ b/doc/泛读报告/泛读报告.md
@ -1 +1,12 @@
-test
+<<<<<<< HEAD
 1 2
 85de61dbca5a0b894469df847a42be9e5905c00a
 =======
 test
 1 2
 85de61dbca5a0b894469df847a42be9e5905c00a
 >>>>>>> b8ef232 (提交说明)
--- a/4984
+++ b/4984
--- a/1
+++ b/1
@ -0,0 +1 @@
 Subproject commit 01bd9cf7900df1ad8b56def902047cb06919ac55
--- a/1
+++ b/1
@ -0,0 +1 @@
 Subproject commit 01bd9cf7900df1ad8b56def902047cb06919ac55
--- a/test.txt
+++ b/test.txt
@ -1,2 +1,4 @@
 已实现：
-便签操作、文件夹、菜单、闹钟提醒、待办事项列表
+便签操作、文件夹、菜单、闹钟提醒、待办事项列表
 1 2 3 4 5 6  ed96c3d (test.txt测试)
--- a/test_5.28.txt
+++ b/test_5.28.txt
Author	SHA1	Message	Date
胡灿	0c50c08df2	初始提交	2 months ago
胡灿	eea1ee3b15	提交说明	2 months ago
胡灿	689d449b36	最初版	2 months ago
John Doe	04cb66861b	未完成	2 months ago
John Doe	b5bfe2b55a	test.txt测试	2 months ago
John Doe	6920d07ad3	添加测试文件	2 months ago
wang-haihui123	0d2ee53bfb	闹钟提醒，超链接、打电话、短信操作等基础功能的全部实现	2 months ago
wang-haihui123	7c3c01905d	代办事项列表实现	2 months ago
wang-haihui123	57a2527e83	便签操作、文件夹、菜单、闹钟提醒，四个功能实现	2 months ago
wang-haihui123	3cf0b92255	推送测试	2 months ago
root	e914cca401	已搭建本地运行平台。	2 months ago
pinq2xrew	c5fb9580ee	Update README.md	2 months ago
		`@ -0,0 +1 @@`
							`Subproject commit 01bd9cf7900df1ad8b56def902047cb06919ac55`