Conflict Solved

forked from buaa21371434/mylab
Merge pull request '任务10第三问' (#6 ) from Feature-21371434 into dev
任务10第三问
1 changed files with 2 additions and 2 deletions
--- a/main.py
+++ b/main.py
@ -1,3 +1,3 @@
 import os
-os.system('python Function-21371193.py')
-os.system('echo Feature-21371193')
+os.system('python Function-21371434.py')
+os.system('echo Feature-21371434')
Author	SHA1	Message	Date
JQKonatsu	2481270a7d	Conflict Solved	2 years ago
buaa21371434	c7c22f7e1a	Merge pull request '任务10第三问' (#6 ) from Feature-21371434 into dev	2 years ago
ling	74d4d441d1	任务10第三问	2 years ago