conflict

main.py

@@ -1,7 +1,13 @@
+#  main.py 文件的内容修改为
 import os
+os.system('python Function-21371177.py')
+os.system('echo Feature-21371177')
+os.system('python Function-21373493.py')
+os.system('echo Feature-21373493')
 os.system('python Function-21371345.py')
 os.system('python Function-21373439.py')
 os.system('echo Feature-21373439')
 os.system('python Function-21373439.py')
 os.system('echo Feature-21373439')
+os.system('echo Function-21371345')