From eed3df83c0df7994ac3f7a2aa60277da4e6340c6 Mon Sep 17 00:00:00 2001
From: BigBig_Zhe <1696144659@qq.com>
Date: Sun, 12 Mar 2023 19:29:09 +0800
Subject: [PATCH 1/4] test

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

diff --git a/main.py b/main.py
index cf12255..b003551 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-21371112.py')
-=======
-os.system('python Function-21371489.py')
->>>>>>> c2ed1daf4fc61d992ba340efac67c0354369a18b

From c1fd2711517a4c771a54d08d9263c3ad53d2da41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=95=AC=E6=B6=9B?= <21371278>
Date: Sun, 12 Mar 2023 19:45:35 +0800
Subject: [PATCH 2/4] Back

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

diff --git a/main.py b/main.py
index 1220121..e69de29 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +0,0 @@
-import os
-os.system('python Function-21371278.py')
\ No newline at end of file

From aa2c882f96646cde5a678d7b11931f39c2d48358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=95=AC=E6=B6=9B?= <21371278>
Date: Sun, 12 Mar 2023 19:47:27 +0800
Subject: [PATCH 3/4] changed

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

diff --git a/main.py b/main.py
index e69de29..1220121 100644
--- a/main.py
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21371278.py')
\ No newline at end of file

From a1850aa4b7a55b21c7af59b6090d4cbc412ed013 Mon Sep 17 00:00:00 2001
From: buaa21371112 <qq1696144659@163.com>
Date: Sun, 12 Mar 2023 20:00:40 +0800
Subject: [PATCH 4/4] Update main.py

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

diff --git a/main.py b/main.py
index 9846cbf..da4d816 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
 import os
-os.system('python Function-21371489.py')
\ No newline at end of file
+os.system('python Function-21371112.py')
\ No newline at end of file