20231098

2 years ago · 4e2090e174
parent 67f51cc554 618b3e93d0
commit 4e2090e174
3 changed files with 8 additions and 1 deletions
--- a/Function-20231140.py
+++ b/Function-20231140.py
@ -0,0 +1 @@
+print('My Student_ID is 20231140')
--- a/Function-71066002.py
+++ b/Function-71066002.py
@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改
+print('My Student_ID is 71066002')
--- a/main.py
+++ b/main.py
@ -1,2 +1,6 @@
 import os
+<<<<<<< HEAD
 os.system('python Function-20231098.py')
+=======
+os.system('python Function-20231140.py')
+>>>>>>> 618b3e93d0b17ea718ae609c45ee2d68522a6e20