From 2be220503e0fe4df9f0b0ce541fd815d63641eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 18:33:45 +0800
Subject: [PATCH 1/9] 20231100

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

diff --git a/main.py b/main.py
index e69de29..788b964 100644
--- a/main.py
+++ b/main.py
@@ -0,0 +1,3 @@
+    # main.py 文件的内容修改为
+    import os
+    os.system('python Function-20231100.py')
\ No newline at end of file

From 17d55f71e88265766494913239ee05f6c7bf83f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 18:48:21 +0800
Subject: [PATCH 2/9] 20231100

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

diff --git a/main.py b/main.py
index 788b964..e69de29 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +0,0 @@
-    # main.py 文件的内容修改为
-    import os
-    os.system('python Function-20231100.py')
\ No newline at end of file

From 82045ed8d444790d853f05a9428d8b54acc8f38b Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 18:51:45 +0800
Subject: [PATCH 3/9] 20231098

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

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

From 4f22017d448281808ccfb1853ac04f9263c6ed2d Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 18:54:03 +0800
Subject: [PATCH 4/9] 20231098

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

diff --git a/main.py b/main.py
index e69de29..dc97d32 100644
--- a/main.py
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+print('Python Function-20231098.py')
\ No newline at end of file

From 41bfb451f45d16adb9446ddf0537332ff3310cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 18:56:12 +0800
Subject: [PATCH 5/9] 20231100

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

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

From dbcce756312ae5bdb8a84dcff980238bf1329836 Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 18:57:32 +0800
Subject: [PATCH 6/9] 20231098

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

diff --git a/main.py b/main.py
index dc97d32..e69de29 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +0,0 @@
-import os
-print('Python Function-20231098.py')
\ No newline at end of file

From ceb3c3db32d41df0d008ca300bb7f30f9d8d2aa5 Mon Sep 17 00:00:00 2001
From: Chenfan <2890259244@qq.com>
Date: Sat, 11 Mar 2023 18:58:28 +0800
Subject: [PATCH 7/9] 20231098

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

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

From 3182329e43f6c088c382f4a91928501731c5d045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 18:59:14 +0800
Subject: [PATCH 8/9] 20231100

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

diff --git a/main.py b/main.py
index 23706e5..27bf322 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 import os
 os.system('python Function-20231100.py')
->>>>>>> Student-20231100

From ca0a4029cc3e6babb138e98546dad56cf7077236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=AD=90=E7=90=AA?= <2238158271@qq.com>
Date: Sat, 11 Mar 2023 19:05:51 +0800
Subject: [PATCH 9/9] Conflict Solved

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

diff --git a/main.py b/main.py
index d29178a..77e112e 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-20231100.py')
-=======
 os.system('python Function-20231098.py')
->>>>>>> 1d2453fb4b6108999994e0367afed160d76c78c8