diff --git a/Function-21373328.py b/Function-21373328.py new file mode 100644 index 0000000..7c5dfcb --- /dev/null +++ b/Function-21373328.py @@ -0,0 +1,2 @@ +# Function-学号.py 文件的内容修改为 +print('My Student_ID is 21373328') \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index c0a3869..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# BUAA-SE-2023-Lab01-Group8 - diff --git a/main.py b/main.py index c929ed1..d3d075b 100644 --- a/main.py +++ b/main.py @@ -1,2 +1,8 @@ +<<<<<<< HEAD import os -os.system('python Function-21373339.py') \ No newline at end of file +os.system('python Function-21373339.py') +======= +# main.py 文件的内容修改为 +import os +os.system('python Function-21373328.py') +>>>>>>> origin/Student-21373328