From eeca10aebdb9cc8e5d9d7c89c0455629fb1d85e5 Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 18:17:08 +0800
Subject: [PATCH 1/2] Coflict Solved

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

diff --git a/main.py b/main.py
index bd66506..3482e08 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,3 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-20231098.py')
-=======
-os.system('python Function-20231140.py')
->>>>>>> 618b3e93d0b17ea718ae609c45ee2d68522a6e20
+

From 91a6800a08b076122da9c44fb91790ebedd3054b Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 18:36:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A9=BA=E7=9A=84main.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/main.py b/main.py
index 3482e08..e69de29 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +0,0 @@
-import os
-os.system('python Function-20231098.py')
-