From a9c32589eaf8d04abcd724efd658e4213ed79ead Mon Sep 17 00:00:00 2001
From: BigBig_Zhe <1696144659@qq.com>
Date: Sat, 11 Mar 2023 15:31:42 +0800
Subject: [PATCH 01/25] Commit

---
 main.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 main.py

diff --git a/main.py b/main.py
new file mode 100644
index 0000000..e69de29

From 261a27c6fc7af475ab09d2a55b8cd91bebc6b369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=95=AC=E6=B6=9B?= <21371278>
Date: Sat, 11 Mar 2023 16:28:48 +0800
Subject: [PATCH 02/25] 1

---
 Function-21371278.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Function-21371278.py

diff --git a/Function-21371278.py b/Function-21371278.py
new file mode 100644
index 0000000..5e4f661
--- /dev/null
+++ b/Function-21371278.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371278')
\ No newline at end of file

From 8f4f76a3a581143b68b4d3f8839db1178e073cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 16:46:42 +0800
Subject: [PATCH 04/25] test1

---
 Function-21371489.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Function-21371489.py

diff --git a/Function-21371489.py b/Function-21371489.py
new file mode 100644
index 0000000..158cbaf
--- /dev/null
+++ b/Function-21371489.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371489')
\ No newline at end of file

From b7754d9a40d9bb46f54c22d93e5420af7fd85013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=95=AC=E6=B6=9B?= <21371278>
Date: Sat, 11 Mar 2023 16:47:45 +0800
Subject: [PATCH 05/25] commit

---
 Student-21371278.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Student-21371278.py

diff --git a/Student-21371278.py b/Student-21371278.py
new file mode 100644
index 0000000..5e4f661
--- /dev/null
+++ b/Student-21371278.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371278')
\ No newline at end of file

From 8a3ee29b5da259c65fe6928bae562e378463564b Mon Sep 17 00:00:00 2001
From: zhongqiu <1848115959@qq.com>
Date: Sat, 11 Mar 2023 16:50:24 +0800
Subject: [PATCH 06/25] submit

---
 Student-21371483.py | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Student-21371483.py

diff --git a/Student-21371483.py b/Student-21371483.py
new file mode 100644
index 0000000..4096b7a
--- /dev/null
+++ b/Student-21371483.py
@@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371483')

From 27391923f6ab068366b319d32dcd769ad8632d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=95=AC=E6=B6=9B?= <21371278>
Date: Sat, 11 Mar 2023 16:50:37 +0800
Subject: [PATCH 07/25] 1

---
 Student-21371278.py | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 Student-21371278.py

diff --git a/Student-21371278.py b/Student-21371278.py
deleted file mode 100644
index 5e4f661..0000000
--- a/Student-21371278.py
+++ /dev/null
@@ -1 +0,0 @@
-print('My Student_ID is 21371278')
\ No newline at end of file

From a496839b028161e56e4bee0dad9120eaf6f08658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=95=AC=E6=B6=9B?= <21371278>
Date: Sat, 11 Mar 2023 16:52:31 +0800
Subject: [PATCH 08/25] commit

---
 Student-21371278.py => Function-21371278.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Student-21371278.py => Function-21371278.py (100%)

diff --git a/Student-21371278.py b/Function-21371278.py
similarity index 100%
rename from Student-21371278.py
rename to Function-21371278.py

From 7e6febdc15957b4ff37fb56745f6fa25b1b88f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=95=AC=E6=B6=9B?= <21371278>
Date: Sat, 11 Mar 2023 17:02:13 +0800
Subject: [PATCH 09/25] changed

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

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

From 802c1b6f0c453093a7082d956e66f117bf308a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 17:04:28 +0800
Subject: [PATCH 10/25] 1

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

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

From d21dc534c75467c85a9c2158948b283127ae69bf Mon Sep 17 00:00:00 2001
From: BigBig_Zhe <1696144659@qq.com>
Date: Sat, 11 Mar 2023 17:06:27 +0800
Subject: [PATCH 11/25] commit

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

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

From c2ed1daf4fc61d992ba340efac67c0354369a18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 17:06:31 +0800
Subject: [PATCH 12/25] 1

---
 Function-21371489.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Function-21371489.py

diff --git a/Function-21371489.py b/Function-21371489.py
new file mode 100644
index 0000000..158cbaf
--- /dev/null
+++ b/Function-21371489.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371489')
\ No newline at end of file

From 348536d96b85345aa6c3f264c0674424001677c8 Mon Sep 17 00:00:00 2001
From: zhongqiu <1848115959@qq.com>
Date: Sat, 11 Mar 2023 17:12:00 +0800
Subject: [PATCH 13/25] tag

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

diff --git a/main.py b/main.py
new file mode 100644
index 0000000..56c1700
--- /dev/null
+++ b/main.py
@@ -0,0 +1,3 @@
+# main.py 文件的内容修改为
+import os
+os.system('python Function-21371483.py')

From a9f84412f3fe3b85ac672b20099908db31df056a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 17:17:03 +0800
Subject: [PATCH 14/25] 1

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

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

From 20e33ecca27eab7806ec838af75c71b2f26e995b Mon Sep 17 00:00:00 2001
From: buaa21371112 <qq1696144659@163.com>
Date: Sat, 11 Mar 2023 17:27:52 +0800
Subject: [PATCH 15/25] Update

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

diff --git a/main.py b/main.py
index 093b2e7..b003551 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
 import os
-os.system('python Function-21371489.py')
+os.system('python Function-21371112.py')

From 3159fcadc7d8595b35753df199b9b6912937151d Mon Sep 17 00:00:00 2001
From: buaa21371058 <1450942553@qq.com>
Date: Sat, 11 Mar 2023 17:30:57 +0800
Subject: [PATCH 16/25] 21371058

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

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

From 213c40f08e7ba250b3669c3e79fa61c3cd5e148a Mon Sep 17 00:00:00 2001
From: buaa21371112 <qq1696144659@163.com>
Date: Sat, 11 Mar 2023 17:31:31 +0800
Subject: [PATCH 18/25] Update main.py

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

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

From c07afc9bcf9cdb623b269e9243d76684020b12c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 17:49:41 +0800
Subject: [PATCH 19/25] 1

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

diff --git a/main.py b/main.py
index 9846cbf..86a9a8e 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-2137148.py')
\ No newline at end of file

From f779f2e248d9b465768ab23a072bed9211fcc204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 17:49:57 +0800
Subject: [PATCH 20/25] 1

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

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

From 3880cdd980160da59253b321871ed966fe7e48c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 17:52:24 +0800
Subject: [PATCH 21/25] 1234

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

diff --git a/main.py b/main.py
index 9846cbf..65e854e 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-2137149.py')
\ No newline at end of file

From 0f547866feaed464c68711bbbd5e01859ebb1a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 17:52:34 +0800
Subject: [PATCH 22/25] 1234

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

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

From df05193555323752e5725718c84cc438339e006a Mon Sep 17 00:00:00 2001
From: buaa21371058 <1450942553@qq.com>
Date: Sat, 11 Mar 2023 17:53:18 +0800
Subject: [PATCH 23/25] Conflict Solved

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

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

From a1adcd2da9d2854e0b57e156c52c1d116166e3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E6=99=AF=E5=87=A1?=
 <dongjingfan@liangyangdeMacBook-Pro.local>
Date: Sat, 11 Mar 2023 17:56:44 +0800
Subject: [PATCH 24/25] 123

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

diff --git a/main.py b/main.py
index b003551..093b2e7 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
 import os
-os.system('python Function-21371112.py')
+os.system('python Function-21371489.py')

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 25/25] 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