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

23
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
Author	SHA1	Message	Date
buaa21371434	91b39219b2	Merge pull request '21371413我要合并' (#18 ) from buaa21371413/mylab:Feature-21371413 into dev	2 years ago
尤世博	634f4d04ea	23	2 years ago
尤世博	64ea313d0d	23	2 years ago
尤世博	c9bba58564	Merge branch 'dev' into Feature-21371413	2 years ago
尤世博	19f2afcd14	y	2 years ago
尤世博	3c69da0d94	you	2 years ago
尤世博	de39dbe6e2	y	2 years ago
尤世博	363414a444	you	2 years ago