From 76d3020b09d5f85431e3965491df064207b4d112 Mon Sep 17 00:00:00 2001
From: AlpaCa <2604307870@qq.com>
Date: Sat, 11 Mar 2023 20:13:52 +0800
Subject: [PATCH] Conflict Solved

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

diff --git a/main.py b/main.py
index f28c86c..5d78362 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-21373067.py')
-=======
-os.system('python Function-21371101.py')     
->>>>>>> Student-21371101