Merge pull request 'pr' (#12 ) from buaa21373138/BUAA-SE-2023-Lab01-Group20:Feature-21373138 into dev

Confict Solved
1
1 changed files with 2 additions and 0 deletions
--- a/main.py
+++ b/main.py
@ -1,3 +1,5 @@
+# main.py 文件的内容修改为
 import os
 os.system('python Function-21373129.py')
 os.system('echo Feature-21373129')
+
Author	SHA1	Message	Date
buaa21373129	833a691d32	Merge pull request 'pr' (#12 ) from buaa21373138/BUAA-SE-2023-Lab01-Group20:Feature-21373138 into dev	3 years ago
夏厚敬	bd136a5adb	Confict Solved	3 years ago
夏厚敬	c6a3398958	1	3 years ago
王剑飞	0b4fa3588c	Merge branch 'dev'	3 years ago
王剑飞	494bc66313	Merge branch 'dev'	3 years ago
王剑飞	7d8ce4036d	test	3 years ago