From 7d607d4898905ea0cda7ed97f9193dbe150ee82e Mon Sep 17 00:00:00 2001
From: lyz <21371188>
Date: Sat, 11 Mar 2023 17:51:37 +0800
Subject: [PATCH] 4

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

diff --git a/main.py b/main.py
index ef01faa..069aab5 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371258.py')
-=======
-os.system('python Function-21371188.py')
->>>>>>> Student-21371188
+os.system('python Function-21371188.py')
\ No newline at end of file