Compare commits

..

1 Commits

Author SHA1 Message Date
卢茂良 c8f5c4d400 Conflict Solved
3 years ago

@ -1,3 +1,2 @@
# Function-学号.py 文件的内容修改为
print('My Student_ID is 20375091')
print('My Name is 卢茂良')
print('My Student_ID is 20375091')

@ -1,3 +1,2 @@
# Function-学号.py 文件的内容修改为
print('My Student_ID is 21371470')
print('My Name is 魏浩哲')
print('My Student_ID is 21371470')

@ -1,3 +1 @@
# Function-21371504.py 文件的内容修改为
print('My Student_ID is 21371504')
print('My Name is 朱天亦')
print('My Student_ID is 21371504')

@ -1,4 +1,2 @@
# Function-学号.py 文件的内容修改为
# Function-学号.py 文件的内容修改为
print('My Student_ID is 21373443')
print('My Name is 郑凯')
print('My Student_ID is 21373443')

@ -1,4 +1,3 @@
# main.py 文件的内容修改为
import os
os.system('python Function-20375091.py')
os.system('echo Feature-20375091')
os.system('python Function-21371504.py')

Loading…
Cancel
Save