Conflict Solved

Function-21371058.py

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

Function-21371278.py

@@ -1,2 +0,0 @@
-print('My Student_ID is 21371278')
-print('My name is 陈敬涛')

Function-21371489.py

@@ -1,2 +0,0 @@
-print('My Student_ID is 21371489')
-print('My Name is 董景凡')

Student-21371483.py

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

main.py

@@ -1,3 +1,2 @@
 import os
-os.system('python Function-21371112.py')
-os.system('echo Feature-21371112')
+os.system('python Function-21371058.py')

test.txt

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