branch_merge

Merge branch 'dev'
没有问题
5 changed files with 9 additions and 3 deletions
--- a/Function-20241069.py
+++ b/Function-20241069.py
@ -1 +1,2 @@
 print('My Student_ID is 20241069')
 print('My Name is Geoffrey')
--- a/Function-20241077.py
+++ b/Function-20241077.py
@ -1 +1,3 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 20241077')
 print('My Name is valentin')
--- a/Function-20241085.py
+++ b/Function-20241085.py
@ -1 +1,2 @@
 print('My Student_ID is 20241085')
 print('My Name is 黎耀坤')
--- a/Function-20374319.py
+++ b/Function-20374319.py
@ -1,2 +1,3 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 20374319')
 print('My Name is 蒋康')
--- a/main.py
+++ b/main.py
@ -1,2 +1,3 @@
 import os
 os.system('python Function-20241069.py')
Author	SHA1	Message	Date
Geoffrey	a8ad2de4c2	branch_merge	3 years ago
Geoffrey	50b07814e5	Merge branch 'dev'	3 years ago
mwlegj4uv	f7a3fbf4fe	没有问题	3 years ago
Q9-K	4798c8cc3d	修改function-20374319内容	3 years ago
buaa20241085	a7a77831d9	Merge pull request '向 dev 分支发起 Pull Request' (#8 ) from Feather-20241085 into dev	3 years ago
黎耀坤	99010adc0f	修改Function-20241085.py文件	3 years ago
buaa20241077	e193eb4963	Merge pull request 'qiuqiuning' (#7 ) from Feature-20241077 into dev	3 years ago
zzr	bf19ba306e	1	3 years ago
buaa20241069	95bb69fbf1	Merge pull request 'Branch_Merge' (#5 ) from Feature-20241069 into dev	3 years ago
GeoffreyZhang	10190fbf39	NewBranch_pull	3 years ago
buaa20241069	67a550a2af	ADD file via upload	3 years ago
zzr	1f2384aab1	Merge branch 'dev' of https://bdgit.educoder.net/buaa20241069/BUAA-SE-2023-Lab01-Group5 into dev	3 years ago
Q9-K	27c9a9a31c	Conflict Solved	3 years ago
黎耀坤	73d77b3b22	Merge	3 years ago
黎耀坤	31764a1b90	save	3 years ago
Q9-K	c02e4ad40a	dbwadwada	3 years ago