MMM

Function-21371192.py

@@ -1 +1,2 @@
-print('My Student_ID is 21371192')
+print('My Student_ID is 21371192')
+print('My Name is 王晰')

Function-21371193.py

@@ -1 +1,2 @@
-print('My Student_ID is 21371193')
+print('My Student_ID is 21371193')
+print('My Name is 张文津')

Function-21371413.py

@@ -1,3 +1,2 @@
-# main.py 文件的内容修改为
+print('My Student_ID is 21371413')
-import os
+print('My Name is 尤世博')
-os.system('python Function-21371413.py')

Function-21371427.py

@@ -1 +1,2 @@
-print('My Student_ID is 21371427')
+print('My Student_ID is 21371427')
+print('My Name is luochuan')

Function-21371434.py

@@ -1 +1,2 @@
-print('My Student_ID is 21371434')
+print('My Student_ID is 21371434')
+print('My Name is 龚翼辉')

main.py

@@ -1,3 +1,8 @@
 import os
+<<<<<<< HEAD
 os.system('python Function-21371192.py')
-os.system('echo Feature-21371192')
+os.system('echo Feature-21371192')
+=======
+os.system('python Function-21371434.py')
+os.system('echo Feature-21371434')
+>>>>>>> dev