From fdca92d0ca846614dabdaa245387b38560602bd0 Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 21:28:28 +0800
Subject: [PATCH 1/4] 2

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

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

From c39bbc0dbd7de9c3cc942ab4882f8d82392aaef7 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:31:53 +0800
Subject: [PATCH 2/4] 20231100

---
 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 a96bb6fc59d564f0bd24eee8b1eedc55e6572a79 Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 21:41:38 +0800
Subject: [PATCH 3/4] 2

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

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

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

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

diff --git a/main.py b/main.py
index 0e6b7b9..77e112e 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 import os
 os.system('python Function-20231098.py')
->>>>>>> student-20231098