Merge pull request 'xjx' (#21 ) from buaa20351005/BUAA-SE-2023-Lab01-Group5:Feature-20351005 into dev

Merge branch 'dev' into Feature-20351005
Merge pull request 'balabala' (#20 ) from mwlegj4uv/BUAA-SE-2023-Lab01-Group5:Feature-20374319 into dev
2 changed files with 12 additions and 1 deletions
--- a/Function-20351005.py
+++ b/Function-20351005.py
@ -1 +1,2 @@
-print('My Student_ID is 20351005')
+print('My Student_ID is 20351005')
 print('My Name is xjx')
--- a/main.py
+++ b/main.py
@ -1,3 +1,13 @@
 # main.py 文件的内容修改为
 import os
 os.system('python Function-20351005.py')
 os.system('echo Feature-20351005')
 os.system('python Function-20241085.py')
 os.system('echo Feature-20241085')
 os.system('python Function-20241077.py')
 os.system('echo Feature-20241077')
 os.system('python Function-20241069.py')
 os.system('echo Feature-20241069')
 os.system('python Function-20374319.py')
 os.system('echo Feature-20374319')
Author	SHA1	Message	Date
buaa20241069	23c31feb7d	Merge pull request 'xjx' (#21 ) from buaa20351005/BUAA-SE-2023-Lab01-Group5:Feature-20351005 into dev	3 years ago
20351005	ead5364bf0	Merge branch 'dev' into Feature-20351005	3 years ago
buaa20241069	9202710b81	Merge pull request 'balabala' (#20 ) from mwlegj4uv/BUAA-SE-2023-Lab01-Group5:Feature-20374319 into dev 111	3 years ago
Q9-K	8f5722e372	dwadasda	3 years ago
Geoffrey	2888ac6b70	delete_pics	3 years ago
buaa20241069	0133c1faa6	Merge pull request '合并1' (#13 ) from mwlegj4uv/BUAA-SE-2023-Lab01-Group5:Feature-20374319 into dev	3 years ago
buaa20241069	64bc0887f4	Merge pull request '处理完冲突后推送至远程仓库并再次发起 PR 让组长审核' (#19 ) from buaa20241085/BUAA-SE-2023-Lab01-Group5:Feather-20241085 into dev	3 years ago
DISGUISE	8de2881013	处理冲突完成	3 years ago
DISGUISE	42e66bcd60	1	3 years ago
buaa20241069	71ca6b6cc0	Merge pull request '666' (#18 ) from buaa20241077/BUAA-SE-2023-Lab01-Group5:Feature-20241077 into dev	3 years ago
Valentin	87a1c8cce3	1	3 years ago
buaa20241077	a0bbefbe67	Merge pull request '111' (#10 ) from buaa20241077/BUAA-SE-2023-Lab01-Group5:Feature-20241077 into dev	3 years ago
Valentin	9ffd888e67	1	3 years ago
Valentin	26722254d5	1	3 years ago
Valentin	0575d1ab1b	2	3 years ago
buaa20241069	16c74c4a0e	Merge pull request 'Pull Request' (#16 ) from Feature-20241069 into dev	3 years ago
Geoffrey	27862cf642	new_branch creat	3 years ago
20351005	546c84be73	l10	3 years ago
Q9-K	dff24e6fc6	issue图片	3 years ago
Q9-K	4af568db79	Merge branch 'dev' into Feature-20374319 # Conflicts: # main.py	3 years ago
Q9-K	04ff1d6ee4	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # main.py	3 years ago
Q9-K	99aea97f57	变更main.py	3 years ago
Q9-K	0ec620f9bc	Merge branch 'dev' into Feature-20374319	3 years ago
Q9-K	29226558a5	变更main.py	3 years ago
Q9-K	018407df6b	变更main.py	3 years ago
Q9-K	6d764740e0	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # main.py	3 years ago
buaa20241085	ce64f50367	Merge pull request '向上游仓库的 dev 分支发起 Pull Request' (#11 ) from buaa20241085/BUAA-SE-2023-Lab01-Group5:Feather-20241085 into dev	3 years ago
黎耀坤	3d7255eafa	修改main.py	3 years ago
Q9-K	b39c444886	变更main.py	3 years ago
Valentin	03380292bb	1	3 years ago
buaa20241069	a630370faa	Update Function-20351005.py	3 years ago
Q9-K	83d86f72b2	变更main.py	3 years ago
Q9-K	5cab566ec7	变更main.py	3 years ago
Q9-K	631958e97f	变更main.py	3 years ago
`@ -1 +1,2 @@`
	`print('My Student_ID is 20351005')`	`print('My Student_ID is 20351005')`
		`print('My Name is xjx')`