From 7c332fd17393db34df6cd14a37c006fa4703ab10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E8=88=92=E7=9B=88?= <71066002>
Date: Sat, 11 Mar 2023 09:06:39 +0000
Subject: [PATCH 01/10] part2

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

diff --git a/main.py b/main.py
index 512b844..068293a 100644
--- a/main.py
+++ b/main.py
@@ -1 +1,3 @@
-#李晨帆 20231098 lab1
\ No newline at end of file
+# main.py 文件的内容修改为
+import os
+os.system('python Function-学号.py')
\ No newline at end of file

From d931be7cc5d92155296d66a1c7e3a7673ecce145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E8=88=92=E7=9B=88?= <71066002>
Date: Sat, 11 Mar 2023 09:22:21 +0000
Subject: [PATCH 02/10] buaa710666002

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

diff --git a/Function-71066002.py b/Function-71066002.py
index 04968cd..df92cac 100644
--- a/Function-71066002.py
+++ b/Function-71066002.py
@@ -1,2 +1,2 @@
-# Function-学号.py 文件的内容修改
+# Function-学号.py 文件的内容修改为
 print('My Student_ID is 71066002')
\ No newline at end of file

From 0de85c713529dea2f3999d9c64928d9fd10b8b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E8=88=92=E7=9B=88?= <71066002>
Date: Sat, 11 Mar 2023 10:10:14 +0000
Subject: [PATCH 03/10] buaa71066002

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

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

From 978bb1ceb599ef7122e6194d9eb740f489cb9010 Mon Sep 17 00:00:00 2001
From: Zora <qy031110@gmail.com>
Date: Sat, 11 Mar 2023 18:45:43 +0800
Subject: [PATCH 04/10] test

---
 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..5bfc0ee
--- /dev/null
+++ b/main.py
@@ -0,0 +1,3 @@
+# main.py 文件的内容修改为
+import os
+os.system('python Function-71216004.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 05/10] 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 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 06/10] 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 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 07/10] 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 08/10] 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

From 4096476c4c24a0a0fbe7a77852fa71b271d6ab97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E8=88=92=E7=9B=88?= <71066002>
Date: Sat, 11 Mar 2023 11:28:12 +0000
Subject: [PATCH 09/10] reset

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

diff --git a/main.py b/main.py
deleted file mode 100644
index b4a2eee..0000000
--- a/main.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# main.py 文件的内容修改为
-import os
-os.system('python Function-71066002.py')
\ No newline at end of file

From 9911cd4325ce8da9ebfc5339acc60ac9751d8556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E8=88=92=E7=9B=88?= <71066002>
Date: Sat, 11 Mar 2023 11:28:52 +0000
Subject: [PATCH 10/10] main

---
 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..b4a2eee
--- /dev/null
+++ b/main.py
@@ -0,0 +1,3 @@
+# main.py 文件的内容修改为
+import os
+os.system('python Function-71066002.py')
\ No newline at end of file