Merge pull request 'aaaa' (#15 ) from buaa21371218/BUAA-SE-2023-Lab01-Group8:Feature-21371218 into dev

no message
Merge pull request 'aaaa' (#14 ) from Feature-21371218 into dev
2 changed files with 4 additions and 7 deletions
--- a/Function-21371218.py
+++ b/Function-21371218.py
@ -0,0 +1,2 @@
+print('My Student_ID is 21371218')
+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-21371218.py')
+os.system('echo Feature-学号')
Author	SHA1	Message	Date
buaa21373339	d9e2f0f8bc	Merge pull request 'aaaa' (#15 ) from buaa21371218/BUAA-SE-2023-Lab01-Group8:Feature-21371218 into dev	2 years ago
sheng	0e4c58dce1	no message	2 years ago
buaa21373339	439043b482	Merge pull request 'aaaa' (#14 ) from Feature-21371218 into dev	2 years ago
sheng	0cf059f00f	no message	2 years ago
sheng	bedc2ecb79	Merge branch 'Student-21371218' into dev	2 years ago
sheng	dd73872bf2	no message	2 years ago
sheng	c53db8921a	Merge branch 'Student-21371218' into dev # Conflicts: # Function-21371218.py	2 years ago
sheng	01420fa1eb	no message	2 years ago
sheng	fa3f1725fa	Revert "no message" This reverts commit `850524355d`.	2 years ago
sheng	850524355d	no message	2 years ago
QAQLeonard	185418449b	Merge remote-tracking branch 'origin/dev'	2 years ago
buaa21373339	2badd305cc	Merge pull request 'wu' (#13 ) from Feature-21373330 into dev	2 years ago
QAQLeonard	2a1cdaf52b	no message	2 years ago
QAQLeonard	479878ef70	no message	2 years ago
buaa21373339	8734f6be82	Merge pull request '123' (#11 ) from Feature-21373328 into dev	2 years ago
LAPTOP-559U08P6\16264	e6342aad1c	no message	2 years ago
buaa21373339	659766b517	Merge pull request '猫娘最可爱' (#9 ) from buaa21373335/BUAA-SE-2023-Lab01-Group8:Feature-21373335 into dev	2 years ago
oven030	04423c0140	my commit	2 years ago