From e7d8a51983c132199c049c4efe8ea7a46f3eb9ff Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 21:42:42 +0800
Subject: [PATCH] 2

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

diff --git a/main.py b/main.py
index 0e6b7b9..77e112e 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 import os
 os.system('python Function-20231098.py')
->>>>>>> student-20231098