From 041e984b66dc18ad027adff2bc890b006b9cf80f Mon Sep 17 00:00:00 2001
From: "LAPTOP-559U08P6\\16264" <1626450436@qq.com>
Date: Sat, 11 Mar 2023 17:36:48 +0800
Subject: [PATCH] no message

---
 main.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index d3d075b..f6aa503 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,4 @@
-<<<<<<< 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-学号.py')
+os.system('echo Feature-学号')
\ No newline at end of file
-- 
2.34.1