1

2 years ago · 5a5c55f5b5
parent e05af69a34
commit 5a5c55f5b5
1 changed files with 0 additions and 6 deletions
--- a/Function-21371363.py
+++ b/Function-21371363.py
@ -1,7 +1 @@
-<<<<<<< HEAD
-# Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371363')
-print('My Name is 陈子恒')
-=======
-print('My Student_ID is 21371363')
->>>>>>> Student-21371363