From 04423c01400597721408c46ead7341eb9c2ecadd Mon Sep 17 00:00:00 2001 From: oven030 <21373335@buaa.edu.cn> Date: Sat, 11 Mar 2023 17:20:54 +0800 Subject: [PATCH 1/4] my commit --- main.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/main.py b/main.py index d3d075b..79038f7 100644 --- 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') \ No newline at end of file From e6342aad1c7cc16b64977897fb0b3427d240dfab Mon Sep 17 00:00:00 2001 From: "LAPTOP-559U08P6\\16264" <1626450436@qq.com> Date: Sat, 11 Mar 2023 17:44:16 +0800 Subject: [PATCH 2/4] no message --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 79038f7..0c88062 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,3 @@ import os -os.system('python Function-21373335.py') -os.system('echo Function-21373335') \ No newline at end of file +os.system('python Function-21373328.py') +os.system('echo Function-21373328') \ No newline at end of file From 479878ef70826aadc4cf468ca7deb4e9096ebf00 Mon Sep 17 00:00:00 2001 From: QAQLeonard Date: Sat, 11 Mar 2023 17:49:20 +0800 Subject: [PATCH 3/4] no message --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 0c88062..6ccb59c 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,3 @@ import os -os.system('python Function-21373328.py') -os.system('echo Function-21373328') \ No newline at end of file +os.system('python Function-21373339.py') +os.system('echo Function-21373339') \ No newline at end of file From 2a1cdaf52b4af293047417df6c2d3e9935197d37 Mon Sep 17 00:00:00 2001 From: QAQLeonard Date: Sat, 11 Mar 2023 17:51:17 +0800 Subject: [PATCH 4/4] no message --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 6ccb59c..e984607 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,3 @@ import os -os.system('python Function-21373339.py') -os.system('echo Function-21373339') \ No newline at end of file +os.system('python Function-21373330.py') +os.system('echo Function-21373330') \ No newline at end of file