Merge branch 'dev' of https://bdgit.educoder.net/buaa20376092/BUAA-SE-2023-Lab01-Group17 into Feature-20374236

2 years ago · ad29815017
parent cae163f671 018d4bf1a5
commit ad29815017
1 changed files with 5 additions and 0 deletions
--- a/main.py
+++ b/main.py
@ -1,3 +1,8 @@
 import os
+<<<<<<< HEAD
+os.system('python Function-20376399.py')
+os.system('echo Feature-20376399')
+=======
 os.system('python Function-20376092.py')
 os.system('echo Feature-20376092')
+>>>>>>> 997cbdd719016e6df6f7d8e1c74c11f52e093c6b