no message

Merge remote-tracking branch 'origin/Student-21373328' into dev
# Conflicts: # main.py
4 changed files with 12 additions and 2 deletions
--- a/Function-21373328.py
+++ b/Function-21373328.py
@ -0,0 +1,3 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21373328')
+print('My Name is 王陆昊')
--- a/Function-21373339.py
+++ b/Function-21373339.py
@ -0,0 +1 @@
+print('My Student_ID is 21373339')
--- a/README.md
+++ b/README.md
@ -1,2 +0,0 @@
-# BUAA-SE-2023-Lab01-Group8
-
--- a/main.py
+++ b/main.py
@ -0,0 +1,8 @@
+<<<<<<< HEAD
+import os
+os.system('python Function-21373339.py')
+=======
+# main.py 文件的内容修改为
+import os
+os.system('python Function-21373328.py')
+>>>>>>> origin/Student-21373328
Author	SHA1	Message	Date
LAPTOP-559U08P6\16264	02f5befda5	no message	2 years ago
LAPTOP-559U08P6\16264	64b5c6c2ae	Merge remote-tracking branch 'origin/Student-21373328' into dev # Conflicts: # main.py	2 years ago
LAPTOP-559U08P6\16264	45ec684385	Merge remote-tracking branch 'origin/dev' into Student-21373328	2 years ago
buaa21373339	538d2cb714	Merge pull request 'test' (#3 ) from Student-21373339 into dev	2 years ago
LAPTOP-559U08P6\16264	b9a8c94521	no message	2 years ago
LAPTOP-559U08P6\16264	873774fa0c	no message	2 years ago
QAQLeonard	7bbc53facf	Merge remote-tracking branch 'origin/Student-21373339' into dev	2 years ago
QAQLeonard	514c54ad5c	no message	2 years ago
QAQLeonard	53d664e19b	no message	2 years ago
QAQLeonard	9f6f6cec33	no message	2 years ago
QAQLeonard	301f77f714	commit	2 years ago