BUAA-SE-2023-Lab01-Group18

@@ -0,0 +1 @@
+Subproject commit f0329e95bc3ac8f27cb65119d3b2e10a1ea846d2

Function-21371404.py

@@ -1 +1,2 @@
 print('My Student_ID is 21371404')
+print('My Name is TRJ')

Function-21373457.py

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

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')

myshixun

@@ -0,0 +1 @@
+Subproject commit 80f3931963293b6069ceafafd45b9ada1f014b20