Conflict Solved

Conflict
s
3 changed files with 3 additions and 5 deletions
--- a/Function-20375091.py
+++ b/Function-20375091.py
@ -1,3 +1,2 @@
 # Function-学号.py 文件的内容修改为
-print('My Student_ID is 20375091')
-print('My Name is 卢茂良')
+print('My Student_ID is 20375091')
--- a/Function-21373443.py
+++ b/Function-21373443.py
@ -1,2 +1,2 @@
 # Function-学号.py 文件的内容修改为
-print('My Student_ID is 学号')
+print('My Student_ID is 21373443')
--- a/main.py
+++ b/main.py
@ -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')
Author	SHA1	Message	Date
卢茂良	c8f5c4d400	Conflict Solved	3 years ago
魏浩哲	eb3f2083f8	Conflict	3 years ago
魏浩哲	b15ff9e2cb	s	3 years ago
卢茂良	2f83b6951a	gr	3 years ago
魏浩哲	469b03896a	Merge branch 'dev' of http://bdgit.educoder.net/buaa21371504/BUAA-SE-2023-Lab01-Group16 into Student-21371470	3 years ago
魏浩哲	b98b0c930c	whz	3 years ago