Merge remote-tracking branch 'origin/dev'

2 years ago · 185418449b
parent b9c4d3a25b 2badd305cc
commit 185418449b
1 changed files with 2 additions and 7 deletions
--- a/main.py
+++ b/main.py
@ -1,8 +1,3 @@
-<<<<<<< HEAD
 import os
-os.system('python Function-21373339.py')
-=======
-# main.py 文件的内容修改为
-import os
-os.system('python Function-21373328.py')
->>>>>>> origin/Student-21373328
+os.system('python Function-21373330.py')
+os.system('echo Function-21373330')