test2

Merge branch 'Student-21373457' of https://bdgit.educoder.net/buaa21371404/BUAA-SE-2023-Lab01-Group18 into Student-21373457
test1
7 changed files with 2 additions and 17 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/Function-20374188.py
+++ b/Function-20374188.py
@ -1,2 +0,0 @@
-print('My Student_ID is 20374188')
-print('My Name is 李子萌')
--- a/Function-20376345.py
+++ b/Function-20376345.py
@ -1,2 +0,0 @@
-print("My Student_ID is 20376345")
-print('My Name is 罗军忠')
--- a/Function-21371141.py
+++ b/Function-21371141.py
@ -1,2 +0,0 @@
-# Function-学号.py 文件的内容修改为
-print('My Student_ID is 21371141')
--- a/Function-21371404.py
+++ b/Function-21371404.py
@ -1,2 +0,0 @@
-print('My Student_ID is 21371404')
-print('My Name is 唐人杰')
--- a/Function-21373457.py
+++ b/Function-21373457.py
@ -1,2 +1 @@
-print('My Student_ID is 21373457')
-print('My Name is 唐鸣宇')
+print('My Student_ID is 21373457')
--- a/main.py
+++ b/main.py
@ -1,8 +1,2 @@
-#<<<<<<< HEAD
-# main.py 文件的内容修改为
-#import os
-#os.system('python Function-20374188.py')
-#=======
 import os
-os.system('python Funtion-21371404.py')
-#>>>>>>> Student-21371404
+os.system('python Function-21373457.py')
Author	SHA1	Message	Date
Tang Mingyu	3e5a7993af	test2	2 years ago
Tang Mingyu	2dde6a18c2	Merge branch 'Student-21373457' of https://bdgit.educoder.net/buaa21371404/BUAA-SE-2023-Lab01-Group18 into Student-21373457	2 years ago
Tang Mingyu	f5df812ee3	test1	2 years ago
Tang Mingyu	ce59325f01	test1	2 years ago