0313

Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev
Merge pull request 'feature-21371396与dev合并申请' (#5 ) from Feature-21371396 into dev
5 changed files with 1 additions and 13 deletions
--- a/Function-21371101.py
+++ b/Function-21371101.py
@ -1,2 +0,0 @@
 print('My Student_ID is 21371101')
 print('My Name is 张昊然')
--- a/Function-21371396.py
+++ b/Function-21371396.py
@ -1,5 +0,0 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 学号')
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371396')
 print('My Name is 孙宇航')
--- a/Function-21373067.py
+++ b/Function-21373067.py
@ -1,2 +0,0 @@
 print('My Student_ID is 21373067')
 print('My Name is 杨宏飞')
--- a/Function-21373081.py
+++ b/Function-21373081.py
@ -1,3 +0,0 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373081')
 print('My Name is 陶佑鹏')
--- a/main.py
+++ b/main.py
@ -1,2 +1,2 @@
 import os
-os.system('python Function-21373067.py')
+os.system('python Function-20231159.py')
Author	SHA1	Message	Date
Gabriel1159	6c94600e2b	0313	2 years ago
Gabriel1159	432a9c2755	Merge branch 'dev' of https://bdgit.educoder.net/buaa21373067/Group11 into dev	2 years ago
buaa21373067	656599cf29	Merge pull request 'feature-21371396与dev合并申请' (#5 ) from Feature-21371396 into dev	2 years ago
Gabriel1159	96fe7f643a	Conflict Solved	2 years ago
Gabriel1159	851b55c5b3	Conflict Solved	2 years ago
Gabriel1159	ea1a241e20	0313	2 years ago
Gabriel1159	1a2f094197	3013	2 years ago
Gabriel1159	47ca447086	123	2 years ago