Conflict Solved

10-3-1
1 changed files with 0 additions and 2 deletions
--- a/main.py
+++ b/main.py
@ -1,5 +1,3 @@
 # main.py 文件的内容修改为
 import os
 os.system('python Function-21373129.py')
 os.system('echo Feature-21373129')
Author	SHA1	Message	Date
李扬	045e8560e4	Conflict Solved	2 years ago
李扬	8fbb1fcd0f	10-3-1	2 years ago