Conflict Solved

w
Merge branch 'master' into dev
4 changed files with 9 additions and 4 deletions
--- a/Function-21371470.py
+++ b/Function-21371470.py
@ -1,2 +1,3 @@
 # Function-学号.py 文件的内容修改为
-print('My Student_ID is 21371470')
+print('My Student_ID is 21371470')
+print('My Name is 魏浩哲')
--- a/Function-21371504.py
+++ b/Function-21371504.py
@ -1 +1,3 @@
-print('My Student_ID is 21371504')
+# Function-21371504.py 文件的内容修改为
+print('My Student_ID is 21371504')
+print('My Name is 朱天亦')
--- a/Function-21373443.py
+++ b/Function-21373443.py
@ -1,2 +1,4 @@
 # Function-学号.py 文件的内容修改为
-print('My Student_ID is 21373443')
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21373443')
+print('My Name is 郑凯')
--- a/main.py
+++ b/main.py
@ -1,3 +1,3 @@
 # main.py 文件的内容修改为
 import os
- os.system('python Function-21371504.py')
+os.system('python Function-21371504.py')
Author	SHA1	Message	Date
朱天亦	98582d6d3a	Conflict Solved	3 years ago
朱天亦	31bc5bd94f	w	3 years ago
朱天亦	4844f24b54	Merge branch 'master' into dev	3 years ago
buaa21371470	a69e18d4cb	Merge pull request 'whz' (#5 ) from Feature-21371470 into dev	3 years ago
buaa21371504	4e45ca0945	zty zty	3 years ago
朱天亦	210ce12600	sas	3 years ago
buaa21373443	0a01698982	zk zk	3 years ago
buaa21373443	fc3378cf4c	zk	3 years ago
魏浩哲	057668dc8e	whz	3 years ago
卢茂良	6cdc4a2cda	Conflict Solved	3 years ago