Merge pull request '123' (#22 ) from buaa21371274/BUAA-SE-2023-Lab01-Group10:Feature-21371274 into dev

conflict has been solved-zzh
test
1 changed files with 2 additions and 4 deletions
--- a/main.py
+++ b/main.py
@ -1,4 +1,2 @@
-# main.py 文件的内容修改为
-import os
-os.system('python Function-21371153.py')
-os.system('echo Feature-21371153')
+os.system('python Function-21371188.py')
+os.system('echo Feature-21371188')
Author	SHA1	Message	Date
buaa21371188	acfff102d5	Merge pull request '123' (#22 ) from buaa21371274/BUAA-SE-2023-Lab01-Group10:Feature-21371274 into dev	3 years ago
zzh	d4ca450065	conflict has been solved-zzh	3 years ago
zzh	2c2a7623f4	test	3 years ago
buaa21371188	a846943ec4	Merge pull request 'moca 9-3' (#24 ) from buaa21371303/BUAA-SE-2023-Lab01-Group10:Feature-21371303 into dev	3 years ago
unknown	1e2be2c16d	moca 9-3	3 years ago
unknown	a1281f6685	moca 9-3	3 years ago
zzh	41c6a4ef7d	Merge branch 'dev' of https://bdgit.educoder.net/buaa21371188/BUAA-SE-2023-Lab01-Group10 into Feature-21371274	3 years ago
unknown	ad0c8b2367	moca 9-3	3 years ago
zzh	8363720d1e	111	3 years ago
buaa21371188	a519ac8f3b	Merge pull request '1111' (#17 ) from buaa21371153/BUAA-SE-2023-Lab01-Group10:Feature-21371153 into dev	3 years ago
zzh	cfc63c7453	zzh	3 years ago
邵梧桐	1556e34e4b	Merge branches 'dev' and 'dev' of https://bdgit.educoder.net/buaa21371188/BUAA-SE-2023-Lab01-Group10 into Feature-21371153	3 years ago
buaa21371188	1a2986a539	Merge pull request '我是frb' (#12 ) from buaa21371258/BUAA-SE-2023-Lab01-Group10:Feature-21371258 into dev	3 years ago
邵梧桐	9e0ae2391f	hello	3 years ago
frb	58ea95ad09	1	3 years ago
moca	7698fb1a15	moca 9-3	3 years ago
zzh	bce91436f7	zzh	3 years ago
frb	e770565a76	1	3 years ago
lyz	41a9b0c153	Merge branch 'dev' of https://bdgit.educoder.net/buaa21371188/BUAA-SE-2023-Lab01-Group10 into dev	3 years ago
lyz	2f6b0d2b9d	1	3 years ago
unknown	9a61edb92a	moca 9-3	3 years ago