Merge branch 'Student-21371404' into dev

2 years ago · f95f8c158a
parent 7cf48417b5 18ee1ec7b3
commit f95f8c158a
2 changed files with 7 additions and 1 deletions
--- a/Function-21371404.py
+++ b/Function-21371404.py
@ -0,0 +1 @@
+print('My Student_ID is 21371404')
--- a/main.py
+++ b/main.py
@ -1,3 +1,8 @@
+#<<<<<<< HEAD
 # main.py 文件的内容修改为
+#import os
+#os.system('python Function-20374188.py')
+#=======
 import os
-os.system('python Function-20374188.py')
+os.system('python Funtion-21371404.py')
+#>>>>>>> Student-21371404