Merge pull request '21371413我要合并' (#18) from buaa21371413/mylab:Feature-21371413 into dev

2 years ago · 91b39219b2
parent 20672b27ff 634f4d04ea
commit 91b39219b2
1 changed files with 0 additions and 6 deletions
--- a/main.py
+++ b/main.py
@ -1,8 +1,2 @@
 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