Solve conflict in 10-3 20231017

10-3
Merge pull request '冯伟伦' (#11 ) from buaa20231161/BUAA-SE-2023-Lab01-Group12:Feature-20231161 into dev
1 changed files with 2 additions and 2 deletions
--- a/main.py
+++ b/main.py
@ -1,3 +1,3 @@
 import os
-os.system('python Function-20231017.py')
-os.system('echo Feature-20231017')
+os.system('python Function-20231183.py')
+os.system('echo Feature-20231183')
Author	SHA1	Message	Date
翁晨皓	8a218aaa81	Solve conflict in 10-3 20231017	2 years ago
Chants77	39a9a06693	10-3	2 years ago
buaa20231183	26c26f8767	Merge pull request '冯伟伦' (#11 ) from buaa20231161/BUAA-SE-2023-Lab01-Group12:Feature-20231161 into dev	2 years ago
冯伟伦	84b395bd0b	20231161	2 years ago
buaa20231183	b3f2c3e503	Merge pull request '20231183' (#9 ) from Feature-20231183 into dev	2 years ago
Chants77	33270947ba	10-3	2 years ago