Merge branch 'Student-21371389' into dev

main.py modified
6 changed files with 10 additions and 3 deletions
--- a/.nfs000000001423269500000005
+++ b/.nfs000000001423269500000005
--- a/Feature-21371326.py
+++ b/Feature-21371326.py
@ -0,0 +1,2 @@
+print('My Student_ID is 21371326')
+print('My Name is 杨一堂')
--- a/Function-21371389.py
+++ b/Function-21371389.py
@ -0,0 +1,2 @@
+# Function-21371389.py 文件的内容修改为
+print('My Student_ID is 21371389')
--- a/Function-21371518.py
+++ b/Function-21371518.py
@ -1 +1,2 @@
-print('My Student_ID id 21371518')
+print('My Student_ID id 21371518')
+print('My Name is 薛天钰')
--- a/Function-21373146.py
+++ b/Function-21373146.py
@ -1 +1,2 @@
-print('My Student_ID is 21373146')
+print('My Student_ID is 21373146')
+print('My Name is 陈心扬')
--- a/main.py
+++ b/main.py
@ -1,2 +1,3 @@
+# main.py 文件的内容修改为
 import os
-os.system('python Function-21371518.py')
+os.system('python Function-21371389.py')
Author	SHA1	Message	Date
马子杰	3c5b4d238b	Merge branch 'Student-21371389' into dev	2 years ago
马子杰	eb0ea8dc4b	main.py modified	2 years ago
马子杰	5ad84e55ae	Merge branch 'Student-21371389' into dev	2 years ago
马子杰	01ec90149c	Function-21371389.py submitted	2 years ago
马子杰	6927d9fbe2	21371389py	2 years ago
buaa21373146	94bae5539d	Merge pull request '21373146陈心扬第十题第二关' (#7 ) from Feature-21373146 into dev	2 years ago
陈心扬	8e561103ff	Conflict solved	2 years ago
陈心扬	b4506265ef	21373146 t10 2	2 years ago
buaa21371518	e84f8253a7	Merge pull request 'feature21371326 to dev' (#6 ) from buaa21371326/BUAA-SE-2023-Lab01-Group4:Feature-21371326 into master	2 years ago
陈心扬	94df0988ab	Conflict Solved	2 years ago
杨一堂	0ad4a89246	resolve conflict in question3	2 years ago
陈心扬	9984e32b94	Conflict Solved	2 years ago
杨一堂	b8181b3ebe	Merge branch 'Feature-21371326' of https://bdgit.educoder.net/buaa21371326/BUAA-SE-2023-Lab01-Group4 into Feature-21371326 merge feature21371326 to push	2 years ago
杨一堂	5e50264697	Merge branch 'Feature-21371326' of https://bdgit.educoder.net/buaa21371326/BUAA-SE-2023-Lab01-Group4 into Feature-21371326	2 years ago
buaa21371518	75585eb1a2	Merge pull request '第三关PR21371518' (#4 ) from Feature-21371518 into dev	2 years ago
杨一堂	cde1b6522f	21371326 modify main.py	2 years ago
陈心扬	5c30c4c589	把mian改成main	2 years ago
21371518	d10c60683c	合作PR	2 years ago
buaa21371326	502a348ca5	merge 21371326	2 years ago
杨一堂	b1906a2b57	Merge branch 'dev' of https://bdgit.educoder.net/buaa21371518/BUAA-SE-2023-Lab01-Group4 into dev pull dev when remve .nfs	2 years ago
杨一堂	291236c41d	remove .nfs file	2 years ago
杨一堂	63bbf1d5ce	feature 21371326 commit	2 years ago
buaa21373147	798fe19c4e	Merge pull request '21373147' (#2 ) from Feature-21373147 into dev	2 years ago
buaa21371518	947e4dbb4b	Merge pull request '21371518' (#1 ) from Feature-21371518 into dev	2 years ago
21371518	206fbdeddf	21371518-Feature	2 years ago
陈心扬	5ef4b3bc0b	21373146 lab01 t9 t8	2 years ago