From 04423c01400597721408c46ead7341eb9c2ecadd Mon Sep 17 00:00:00 2001
From: oven030 <21373335@buaa.edu.cn>
Date: Sat, 11 Mar 2023 17:20:54 +0800
Subject: [PATCH] my commit

---
 main.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/main.py b/main.py
index d3d075b..79038f7 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
 import os
-os.system('python Function-21373339.py')
-=======
-# main.py 文件的内容修改为
-import os
-os.system('python Function-21373328.py')
->>>>>>> origin/Student-21373328
+os.system('python Function-21373335.py')
+os.system('echo Function-21373335')
\ No newline at end of file