From 04cade6751006964ba95f1244e9fa5dff148724e Mon Sep 17 00:00:00 2001
From: zkx <21373439@buaa.edu.cn>
Date: Sat, 11 Mar 2023 14:32:45 +0000
Subject: [PATCH 1/4] a

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

diff --git a/Function-21373439.py b/Function-21373439.py
index bb8d16c..4200428 100644
--- a/Function-21373439.py
+++ b/Function-21373439.py
@@ -1,3 +1,4 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373439')
 print('My Name is 邹可心')
+

From ed6bf4fb7e6d73f7e5f04907a35e101db9a6f725 Mon Sep 17 00:00:00 2001
From: zkx <21373439@buaa.edu.cn>
Date: Sat, 11 Mar 2023 14:35:04 +0000
Subject: [PATCH 2/4] bb

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

diff --git a/Function-21373439.py b/Function-21373439.py
index 4200428..f5992b6 100644
--- a/Function-21373439.py
+++ b/Function-21373439.py
@@ -2,3 +2,4 @@
 print('My Student_ID is 21373439')
 print('My Name is 邹可心')
 
+

From e51d71ee224e1611fd4786c6c76c3981f1c43813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=A0=97=E6=B1=9F?= <llj603822630@163.com>
Date: Sat, 11 Mar 2023 22:47:40 +0800
Subject: [PATCH 3/4] merge

---
 Function-21371177.py |  3 ++-
 Function-21371345.py |  1 +
 Function-21371348.py |  1 +
 Function-21373439.py | 11 +++++++++++
 Function-21373493.py |  1 +
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Function-21371177.py b/Function-21371177.py
index 6570fee..8be2c90 100644
--- a/Function-21371177.py
+++ b/Function-21371177.py
@@ -1,2 +1,3 @@
 # Function-学号.py 文件的内容修改为
-print('My Student_ID is 2137177')
+print('My Student_ID is 21371177')
+print('My Name is 王铮')
\ No newline at end of file
diff --git a/Function-21371345.py b/Function-21371345.py
index 42288e5..3f1f1cb 100644
--- a/Function-21371345.py
+++ b/Function-21371345.py
@@ -1,2 +1,3 @@
 # Function-21371345.py 文件的内容修改为
 print('My Student_ID is 21371345')
+print('My Name is 刘栗江')
diff --git a/Function-21371348.py b/Function-21371348.py
index e0d02ea..c3633bd 100644
--- a/Function-21371348.py
+++ b/Function-21371348.py
@@ -1,2 +1,3 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371348')
+print('My Name is 刘雨承')
diff --git a/Function-21373439.py b/Function-21373439.py
index 7716934..14247ed 100644
--- a/Function-21373439.py
+++ b/Function-21373439.py
@@ -1,2 +1,13 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373439')
+print('My Name is 邹可心')
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 7ed96b1b75b614f3321d28387cb7564a5200ca5b
+=======
+
+
+>>>>>>> 7ed96b1b75b614f3321d28387cb7564a5200ca5b
diff --git a/Function-21373493.py b/Function-21373493.py
index 511c9e1..07e3a72 100644
--- a/Function-21373493.py
+++ b/Function-21373493.py
@@ -1,2 +1,3 @@
 # Function-学号.py 文件的内容修改为
 print('My Student_ID is 21373493')
+print('My Name is 王子熙')

From 59cd8b18d6f432449c7149e3b955b9eb23eac134 Mon Sep 17 00:00:00 2001
From: zkx <21373439@buaa.edu.cn>
Date: Sat, 11 Mar 2023 15:27:55 +0000
Subject: [PATCH 4/4] 10

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

diff --git a/main.py b/main.py
index ec579cb..a212b97 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,4 @@
 # main.py 文件的内容修改为
 import os
-os.system('python Function-21371345.py')
+os.system('python Function-21373439.py')
+os.system('echo Feature-21373439')