From 1ee69dc224949f312216e24881ec313c9af26ca1 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 21:05:06 +0800
Subject: [PATCH] 2

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

diff --git a/main.py b/main.py
index 23706e5..27bf322 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 import os
 os.system('python Function-20231100.py')
->>>>>>> Student-20231100