test

Function-21371058.py

@@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371058')

Function-21371489.py

@@ -0,0 +1 @@
+print('My Student_ID is 21371489')

Student-21371483.py

@@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371483')

main.py

@@ -1,2 +1,6 @@
 import os
+<<<<<<< HEAD
 os.system('python Function-21371112.py')
+=======
+os.system('python Function-21371489.py')
+>>>>>>> c2ed1daf4fc61d992ba340efac67c0354369a18b

test.txt

@@ -0,0 +1 @@
+test