Conflict Solved

1 changed files with 1 additions and 3 deletions
--- a/Function-21373443.py
+++ b/Function-21373443.py
@ -1,4 +1,2 @@
 # Function-学号.py 文件的内容修改为
-# Function-学号.py 文件的内容修改为
-print('My Student_ID is 21373443')
-print('My Name is 郑凯')
+print('My Student_ID is 21373443')