上传文件至 'doc'

Merge branch 'master' of https://bdgit.educoder.net/plhw57tbe/SoftwareMethodology
Merge branch 'develop'
4 changed files with 2 additions and 1 deletions
--- a/doc/README.md
+++ b/doc/README.md
@ -1 +1 @@
-这是doc目录的说明文档
+# Documentation
--- a/doc/README.md
+++ b/doc/README.md
--- a/doc/开源软件泛读报告.docx
+++ b/doc/开源软件泛读报告.docx
--- a/src/main.py
+++ b/src/main.py
@ -1 +1,2 @@
 print('hello world')
+# This is the main Python file
Author	SHA1	Message	Date
pa2g3nmk9	aee47f7cb4	上传文件至 'doc'	4 months ago
smy	89f603335c	Merge branch 'master' of https://bdgit.educoder.net/plhw57tbe/SoftwareMethodology	5 months ago
smy	3ce0187398	Merge branch 'develop'	5 months ago
fz	c7b1c2a3aa	合并develop分支：解决main.py冲突	5 months ago
fz	f338bb2378	备份develop分支的修改	5 months ago
zxc	57eab4a72d	在src目录添加main.py文件	5 months ago
txb	3c06c750d4	在src目录添加main.py文件	5 months ago
smy	192f27dd24	在master分支添加doc目录及README.md文档	5 months ago
smy	3fac0dcd23	删除master分支中的README.md文件	5 months ago