Confilict Solved

Merge pull request '将新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#2 ) from Feature-21371101 into dev
Merge pull request '10-4-yhf' (#3 ) from Feature-21373067 into dev
3 changed files with 4 additions and 2 deletions
--- a/Function-21371101.py
+++ b/Function-21371101.py
@ -1,2 +1,2 @@
-# Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371101')
+print('My Name is 张昊然')
--- a/Function-21373067.py
+++ b/Function-21373067.py
@ -1 +1,2 @@
-print('My Student_ID is 21373067')
+print('My Student_ID is 21373067')
+print('My Name is 杨宏飞')
--- a/Function-21373081.py
+++ b/Function-21373081.py
@ -1,2 +1,3 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373081')
+print('My Name is 陶佑鹏')
Author	SHA1	Message	Date
AlpaCa	1cd627e2d1	Confilict Solved	2 years ago
buaa21373067	db0f741b36	Merge pull request '将新分支推送至远程仓库并向 dev 分支发起 Pull Request' (#2 ) from Feature-21371101 into dev	2 years ago
buaa21373067	b770be9409	Merge pull request '10-4-yhf' (#3 ) from Feature-21373067 into dev	2 years ago
AlpaCa	27ead23f91	10-4-yhf	2 years ago
zhr	712b367fcf	try	2 years ago
陶佑鹏	6bbad6a97f	add Feature-21373081	2 years ago
陶佑鹏	48f436391b	Merge branch 'student-21373081' into dev	2 years ago
陶佑鹏	81a21a8634	21373081 main.py21373081	2 years ago