From 474994c199f60f557e30e2c5863721dc7e4ec316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B6=E4=BD=91=E9=B9=8F?= <21373081>
Date: Mon, 13 Mar 2023 08:51:26 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=B0=E5=88=86=E6=94=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E8=87=B3=E5=90=84=E8=87=AA=E7=9A=84=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/main.py b/main.py
index 5d78362..c62a7cf 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,4 @@
 import os
-os.system('python Function-21373067.py')
+import os
+os.system('python Function-21373081.py')
+os.system('echo Feature-21373081')
-- 
2.34.1


From 3f017f2865ebe61b9bb0e40f0bde70d4d381c4fc Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Mon, 13 Mar 2023 09:30:50 +0800
Subject: [PATCH 2/9] .

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

diff --git a/Function-21371396.py b/Function-21371396.py
index 77d720e..af1d321 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1 +1,3 @@
-print('My Student_ID is 21371396')
\ No newline at end of file
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 学号')
+print('My Name is 姓名')
\ No newline at end of file
-- 
2.34.1


From 8db4b70d296ad2773d89f8d5d8b84ea8b0ea1e57 Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Mon, 13 Mar 2023 09:53:36 +0800
Subject: [PATCH 3/9] change

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

diff --git a/Function-21371396.py b/Function-21371396.py
index af1d321..45ac605 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1,3 +1,5 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 学号')
-print('My Name is 姓名')
\ No newline at end of file
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371396')
+print('My Name is 孙宇航')
\ No newline at end of file
-- 
2.34.1


From 9e6964f0a74be46b5986cfa910ea6b6ed17a1a0a Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Mon, 13 Mar 2023 10:50:59 +0800
Subject: [PATCH 4/9] ..

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

diff --git a/Function-21371396.py b/Function-21371396.py
index 45ac605..7c384bf 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1,5 +1,2 @@
 # Function-学号.py 文件的内容修改为
-print('My Student_ID is 学号')
-# Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371396')
-print('My Name is 孙宇航')
\ No newline at end of file
-- 
2.34.1


From 16d8332db8667eab8627593bbb1db0817bcd20b9 Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Mon, 13 Mar 2023 10:54:29 +0800
Subject: [PATCH 5/9] ...

---
 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..0d71d83
--- /dev/null
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21371396.py')
\ No newline at end of file
-- 
2.34.1


From 593176b4c2ef5ec5d316b386ea75a43ae6c0965a Mon Sep 17 00:00:00 2001
From: Gabriel1159 <gabriel1159@163.com>
Date: Mon, 13 Mar 2023 11:10:36 +0800
Subject: [PATCH 6/9] Conflict Solved

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

diff --git a/Function-20231159.py b/Function-20231159.py
index f148b5e..cb2d832 100644
--- a/Function-20231159.py
+++ b/Function-20231159.py
@@ -1 +1 @@
-print('My Student_ID is 20231159')
+print('My Student_ID is 20231159') 
-- 
2.34.1


From 3ffcd053fda57f8c013ac4cdd8aa973c47907a47 Mon Sep 17 00:00:00 2001
From: Gabriel1159 <gabriel1159@163.com>
Date: Mon, 13 Mar 2023 11:28:05 +0800
Subject: [PATCH 7/9] 0313

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

diff --git a/Function-20231159.py b/Function-20231159.py
index f148b5e..6159e74 100644
--- a/Function-20231159.py
+++ b/Function-20231159.py
@@ -1 +1,3 @@
+# encoding:utf-8
 print('My Student_ID is 20231159')
+print('My Name is 赵子璁')
-- 
2.34.1


From 043690a86165116d639ea1877eda24cc7a4fac8e Mon Sep 17 00:00:00 2001
From: AlpaCa <2604307870@qq.com>
Date: Mon, 13 Mar 2023 11:42:46 +0800
Subject: [PATCH 8/9] 10.3.5

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

diff --git a/main.py b/main.py
index 5d78362..68f4d1a 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,3 @@
 import os
 os.system('python Function-21373067.py')
+os.system('echo Feature-21373067')
\ No newline at end of file
-- 
2.34.1


From 13e5a756c631e4abc856946638a1ce547f561d7e Mon Sep 17 00:00:00 2001
From: Gabriel1159 <gabriel1159@163.com>
Date: Mon, 13 Mar 2023 12:07:04 +0800
Subject: [PATCH 9/9] 0313

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

diff --git a/main.py b/main.py
index 68f4d1a..f1c0f04 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,3 @@
 import os
-os.system('python Function-21373067.py')
-os.system('echo Feature-21373067')
\ No newline at end of file
+os.system('python Function-20231159.py')
+os.system('echo Feature-20231159')
-- 
2.34.1