From 3c69da0d947cdad05ee53bae658f0e698de03cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=A4=E4=B8=96=E5=8D=9A?= <21371413>
Date: Sun, 12 Mar 2023 00:06:11 +0800
Subject: [PATCH] you

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

diff --git a/main.py b/main.py
index f3c55b6..8393f09 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,3 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371192.py')
-os.system('echo Feature-21371192')
-=======
 os.system('python Function-21371434.py')
 os.system('echo Feature-21371434')
->>>>>>> dev