解决冲突

forked from buaa21373129/BUAA-SE-2023-Lab01-Group20
Merge pull request '21373129' (#15 ) from Feature-21373129 into dev
21373129
1 changed files with 2 additions and 3 deletions
--- a/main.py
+++ b/main.py
@ -1,4 +1,3 @@
-# main.py 文件的内容修改为
 import os
-os.system('python Function-21371363.py')
-os.system('echo Feature-21371363')
+os.system('python Function-21373129.py')
+os.system('echo Feature-21373129')
Author	SHA1	Message	Date
陈子恒	c26f053986	解决冲突	2 years ago
buaa21373129	c56992def7	Merge pull request '21373129' (#15 ) from Feature-21373129 into dev	2 years ago
王剑飞	d3e73e7490	21373129	2 years ago