Conflict Solved

forked from buaa21373129/BUAA-SE-2023-Lab01-Group20
Merge pull request '21373129' (#15 ) from Feature-21373129 into dev
21373129
1 changed files with 1 additions and 1 deletions
--- a/main.py
+++ b/main.py
@ -1,3 +1,3 @@
 import os
 os.system('python Function-21373129.py')
-os.system('echo Feature-21371334')
+os.system('echo Feature-21373129')
Author	SHA1	Message	Date
何宇楷	db967337cf	Conflict Solved	3 years ago
buaa21373129	c56992def7	Merge pull request '21373129' (#15 ) from Feature-21373129 into dev	3 years ago
王剑飞	d3e73e7490	21373129	3 years ago