From ca0a4029cc3e6babb138e98546dad56cf7077236 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 19:05:51 +0800
Subject: [PATCH] Conflict Solved

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

diff --git a/main.py b/main.py
index d29178a..77e112e 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-20231100.py')
-=======
 os.system('python Function-20231098.py')
->>>>>>> 1d2453fb4b6108999994e0367afed160d76c78c8