From 671a6007f6113623a02b2e1811aee6d4f8f10610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 20:56:31 +0800
Subject: [PATCH 1/9] 20231100

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 4a3086e..b5e3a74 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
 import os
-os.system('python Function-20231098.py')
\ No newline at end of file
+os.system('python Function-20231100.py')
\ No newline at end of file

From 2d64c047ffc74dd2ffe024cbaa7a38d9fc363477 Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 21:01:09 +0800
Subject: [PATCH 2/9] 2

---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index 4a3086e..c81d1ce 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,3 @@
+#20231098
 import os
 os.system('python Function-20231098.py')
\ No newline at end of file

From c82732bc1e6ddec82a4d4072f17f0e2b659a42a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 21:03:50 +0800
Subject: [PATCH 3/9] 2

---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index b5e3a74..8a787be 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,3 @@
+#20231100
 import os
 os.system('python Function-20231100.py')
\ No newline at end of file

From a509fe3c7bdb9ef631c748dd7a68d62759caf7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 21:04:41 +0800
Subject: [PATCH 4/9] 2

---
 main.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main.py b/main.py
index 8a787be..b5e3a74 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,2 @@
-#20231100
 import os
 os.system('python Function-20231100.py')
\ No newline at end of file

From 1ee69dc224949f312216e24881ec313c9af26ca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 21:05:06 +0800
Subject: [PATCH 5/9] 2

---
 main.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/main.py b/main.py
index 23706e5..27bf322 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 import os
 os.system('python Function-20231100.py')
->>>>>>> Student-20231100

From 026e443ce6b68cde715a15f792ffe84516684d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 21:05:59 +0800
Subject: [PATCH 6/9] 2

---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index 27bf322..11e2223 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,3 @@
+#1
 import os
 os.system('python Function-20231100.py')

From 09002b92b94b02c85e08b55ad579883817da4239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 21:07:26 +0800
Subject: [PATCH 7/9] null

---
 main.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/main.py b/main.py
index 11e2223..e69de29 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +0,0 @@
-#1
-import os
-os.system('python Function-20231100.py')

From 72a7b16b7e990912038e0c58c0f768084fab4d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 21:08:09 +0800
Subject: [PATCH 8/9] 20231100

---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index b5e3a74..8a787be 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,3 @@
+#20231100
 import os
 os.system('python Function-20231100.py')
\ No newline at end of file

From c06e3063111455e04d28c4e0646d678d0956e318 Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 21:11:03 +0800
Subject: [PATCH 9/9] push

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 93e075d..9dc7201 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,3 @@
-#20231098
+
 import os
 os.system('python Function-20231098.py')