From 418c126ff95c401e952cdb4afce3e880b74c6484 Mon Sep 17 00:00:00 2001
From: luochuan <21371427>
Date: Sat, 11 Mar 2023 20:54:17 +0800
Subject: [PATCH] Conflict Solved

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

diff --git a/main.py b/main.py
index e232c4b..752d2b8 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371427.py')
-=======
 os.system('python Function-21371434.py')
->>>>>>> eb19cf0a280dd1bfae38bbea315c6af03ada4c75