合并develop分支：解决main.py冲突

5 months ago · c7b1c2a3aa
parent 57eab4a72d f338bb2378
commit c7b1c2a3aa
2 changed files with 3 additions and 2 deletions
--- a/doc/README.md
+++ b/doc/README.md
@ -1 +1 @@
-这是doc目录的说明文档
+# Documentation
--- a/src/main.py
+++ b/src/main.py
@ -1 +1,2 @@
-"print('hello world')" 
+print('hello world')
+# This is the main Python file