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

cyx
Merge pull request 'adwwa' (#14 ) from buaa20376399/BUAA-SE-2023-Lab01-Group17:Feature-20376399 into dev
1 changed files with 6 additions and 0 deletions
--- a/main.py
+++ b/main.py
@ -1,2 +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
Author	SHA1	Message	Date
unknown	ad29815017	Merge branch 'dev' of https://bdgit.educoder.net/buaa20376092/BUAA-SE-2023-Lab01-Group17 into Feature-20374236	2 years ago
unknown	cae163f671	cyx	2 years ago
buaa20376399	018d4bf1a5	Merge pull request 'adwwa' (#14 ) from buaa20376399/BUAA-SE-2023-Lab01-Group17:Feature-20376399 into dev	2 years ago
buaa20376399	49277d4956	3	2 years ago
unknown	43c2dfdb12	Merge remote-tracking branch 'upstream/dev' into Feature-20374236	2 years ago
buaa20376399	7f8027c503	l	2 years ago
buaa20376092	997cbdd719	Merge pull request 'abyss Pull/Request' (#6 ) from Feature-20376092 into dev	2 years ago
abyss	cdecd476e8	update main-20376092	2 years ago
unknown	fe69799e52	cyx	2 years ago