Merge branch 'master' of https://bdgit.educoder.net/buaa21371345/BUAA-SE-2023-Lab01-Group19

2 years ago · 29c9d536f5
parent e51d71ee22 7ed96b1b75
commit 29c9d536f5
1 changed files with 0 additions and 10 deletions
--- a/Function-21373439.py
+++ b/Function-21373439.py
@ -1,13 +1,3 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373439')
 print('My Name is 邹可心')
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7ed96b1b75b614f3321d28387cb7564a5200ca5b
-=======
-
-
->>>>>>> 7ed96b1b75b614f3321d28387cb7564a5200ca5b