Conflict Solved

1 changed files with 1 additions and 3 deletions
--- a/Function-21371504.py
+++ b/Function-21371504.py
@ -1,3 +1 @@
-# Function-21371504.py 文件的内容修改为
-print('My Student_ID is 21371504')
-print('My Name is 朱天亦')
+print('My Student_ID is 21371504')