test3

2 years ago · fe9d1cbf32
parent c1cd326bfa
commit fe9d1cbf32
1 changed files with 2 additions and 7 deletions
--- a/main.py
+++ b/main.py
@ -1,8 +1,3 @@
-#<<<<<<< HEAD
-# main.py 文件的内容修改为
-#import os
-#os.system('python Function-20374188.py')
-#=======
 import os
-os.system('python Funtion-21371404.py')
-#>>>>>>> Student-21371404
+os.system('python Function-21373457.py')
+os.system('echo Feature-21373457')