2 changed files with 7 additions and 4 deletions
--- a/Function-21371218.py
+++ b/Function-21371218.py
@ -1,2 +0,0 @@
-print('My Student_ID is 21371218')
-print('My Name is 盛昱豪')
--- a/main.py
+++ b/main.py
@ -1,3 +1,8 @@
+<<<<<<< HEAD
 import os
-os.system('python Function-21371218.py')
-os.system('echo Feature-学号')
+os.system('python Function-21373339.py')
+=======
+# main.py 文件的内容修改为
+import os
+os.system('python Function-21373328.py')
+>>>>>>> origin/Student-21373328