Merge pull request '合并请求喵喵喵' (#13) from buaa21371192/mylab:Feature-21371192 into dev

2 years ago · 20672b27ff
parent c7c22f7e1a 790f299755
commit 20672b27ff
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-21371192.py')
+os.system('echo Feature-21371192')
+=======
 os.system('python Function-21371434.py')
 os.system('echo Feature-21371434')
+>>>>>>> dev