From eed3df83c0df7994ac3f7a2aa60277da4e6340c6 Mon Sep 17 00:00:00 2001
From: BigBig_Zhe <1696144659@qq.com>
Date: Sun, 12 Mar 2023 19:29:09 +0800
Subject: [PATCH] test

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

diff --git a/main.py b/main.py
index cf12255..b003551 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-21371112.py')
-=======
-os.system('python Function-21371489.py')
->>>>>>> c2ed1daf4fc61d992ba340efac67c0354369a18b