From 30310caa7832093aa07a47bcacd66e7b0a1119c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E8=B6=85=E5=87=A1?= <21373104@buaa.edu.cn>
Date: Sat, 11 Mar 2023 17:04:37 +0800
Subject: [PATCH] conflict

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 69e4c95..83fc9f0 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,3 @@
 # main.py 文件的内容修改为
 import os
-os.system('python Function-21371444.py')
\ No newline at end of file
+os.system('python Function-21373104.py')
\ No newline at end of file