解决冲突

RP
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
陈子恒	c26f053986	解决冲突	2 years ago
陈子恒	0fb1c5f13c	RP	2 years ago