0313-2

0313
Conflict Solved
2 changed files with 2 additions and 3 deletions
--- a/Function-20231159.py
+++ b/Function-20231159.py
@ -1 +1,3 @@
 # encoding:utf-8
 print('My Student_ID is 20231159')
 print('My Name is 赵子璁')
--- a/Function-21371396.py
+++ b/Function-21371396.py
@ -1,5 +1,2 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 学号')
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371396')
 print('My Name is 孙宇航')
Author	SHA1	Message	Date
Gabriel1159	0c35dd5f48	0313-2	2 years ago
Gabriel1159	3ffcd053fd	0313	2 years ago
Gabriel1159	593176b4c2	Conflict Solved	2 years ago
buaa21371396	f47b45257e	ConflictSolved	2 years ago
buaa21371396	16d8332db8	...	2 years ago
buaa21371396	9e6964f0a7	..	2 years ago