lzm3

Function-20376345.py

@@ -1,2 +1 @@
 print("My Student_ID is 20376345")
-print('My Name is 罗军忠')

Function-21371404.py

@@ -1,2 +0,0 @@
-print('My Student_ID is 21371404')
-print('My Name is 唐人杰')

Function-21373457.py

@@ -1,2 +0,0 @@
-print('My Student_ID is 21373457')
-print('My Name is 唐鸣宇')

main.py

@@ -1,8 +1,4 @@
-#<<<<<<< HEAD
 # main.py 文件的内容修改为
-#import os
-#os.system('python Function-20374188.py')
-#=======
 import os
-os.system('python Funtion-21371404.py')
+os.system('python Function-20374188.py')
-#>>>>>>> Student-21371404
+os.system('echo Feature-20374188')