处理完冲突后推送至远程仓库

同意
2 changed files with 4 additions and 2 deletions
--- a/Function-20241027.py
+++ b/Function-20241027.py
@ -1 +1,2 @@
 print('My Student_ID is 20241027')
+print('My Name is 吴鑫宇')
--- a/main.py
+++ b/main.py
@ -1,2 +1,3 @@
 import os
 os.system('python Function-20241029.py')
+os.system('echo Feature-20241029')
Author	SHA1	Message	Date
buaa20241032	896ddb8377	处理完冲突后推送至远程仓库	2 years ago
buaa20241029	11cf3e5c3e	同意同意	2 years ago
buaa20241032	99e9df13bc	对 Feature-学号分支上的 main.py 文件进行修改	2 years ago
徐天行	d0855205c6	更改main.py	2 years ago
buaa20241027	29df5fa7bf	Merge pull request '合并' (#5 ) from Feature-20241027 into dev	2 years ago
吴鑫宇	759d031fd5	ch Function-20241027.py	2 years ago
吴鑫宇	4390082174	cha Function-20241027.py	2 years ago