3

Merge pull request 'abyss Pull/Request' (#6 ) from Feature-20376092 into dev
update main-20376092
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
Author	SHA1	Message	Date
buaa20376399	49277d4956	3	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