Conflict Solved

test
2 changed files with 4 additions and 1 deletions
--- a/Function-21371363.py
+++ b/Function-21371363.py
@ -1,3 +1,7 @@
+<<<<<<< HEAD
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371363')
 print('My Name is 陈子恒')
+=======
+print('My Student_ID is 21371363')
+>>>>>>> Student-21371363
--- a/Function-21373138.py
+++ b/Function-21373138.py
@ -1 +0,0 @@
-print('My Student_ID is 21373138')
Author	SHA1	Message	Date
陈子恒	e05af69a34	Conflict Solved	2 years ago
陈子恒	11998ea7e8	test	2 years ago