Conflict Solved

Conflict
s
5 changed files with 9 additions and 0 deletions
--- a/Function-21371470.py
+++ b/Function-21371470.py
@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371470')
--- a/Function-21371480.py
+++ b/Function-21371480.py
@ -0,0 +1 @@
+print('My Student_ID is 21371480')
--- a/Function-21371504.py
+++ b/Function-21371504.py
@ -0,0 +1 @@
+print('My Student_ID is 21371504')
--- a/Function-21373443.py
+++ b/Function-21373443.py
@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21373443')
--- a/main.py
+++ b/main.py
@ -0,0 +1,3 @@
+# main.py 文件的内容修改为
+import os
+ 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
卢茂良	29b6cfde86	dwa	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