my commit

Merge pull request '猫娘最可爱' (#7 ) from Feature-21373335 into dev
Merge pull request 'test' (#5 ) from Feature-21373339 into dev
4 changed files with 8 additions and 9 deletions
--- a/Function-21373328.py
+++ b/Function-21373328.py
@ -1,2 +1,3 @@
 # Function-学号.py 文件的内容修改为
-print('My Student_ID is 21373328')
+print('My Student_ID is 21373328')
+print('My Name is 王陆昊')
--- a/Function-21373330.py
+++ b/Function-21373330.py
@ -0,0 +1,2 @@
+print('My Student_ID is 21373330')
+
--- a/Function-21373339.py
+++ b/Function-21373339.py
@ -1 +1,2 @@
-print('My Student_ID is 21373339')
+print('My Student_ID is 21373339')
+print('My Name is 周星达')
--- a/main.py
+++ b/main.py
@ -1,8 +1,3 @@
-<<<<<<< HEAD
 import os
-os.system('python Function-21373339.py')
-=======
-# main.py 文件的内容修改为
-import os
-os.system('python Function-21373328.py')
->>>>>>> origin/Student-21373328
+os.system('python Function-21373335.py')
+os.system('echo Function-21373335')
Author	SHA1	Message	Date
oven030	04423c0140	my commit	2 years ago
buaa21373339	5effe963eb	Merge pull request '猫娘最可爱' (#7 ) from Feature-21373335 into dev	2 years ago
buaa21373339	c8d1988264	Merge pull request 'test' (#5 ) from Feature-21373339 into dev	2 years ago
QAQLeonard	a16ea309d9	no message	2 years ago
buaa21373339	3334f7fd96	Merge pull request '歪比巴卜' (#4 ) from Feature-21373328 into dev	2 years ago
QAQLeonard	3b3d5fa34d	Merge remote-tracking branch 'origin/Student-21373330' into dev	2 years ago
QAQLeonard	c2f011edc3	no message	2 years ago
LAPTOP-559U08P6\16264	02f5befda5	no message	2 years ago
wuhaoyu	862f62cc57	Wu	2 years ago