From b866cf8ee277db145f8a02270ef62a7effaef91e Mon Sep 17 00:00:00 2001
From: Your Name <21373439@buaa.edu.cn>
Date: Sun, 12 Mar 2023 15:45:54 +0800
Subject: [PATCH 1/4] k

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

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

From 3151b2f846240aea81c94e70afc21583087fe964 Mon Sep 17 00:00:00 2001
From: Your Name <21373439@buaa.edu.cn>
Date: Sun, 12 Mar 2023 20:33:46 +0800
Subject: [PATCH 2/4] do

---
 main.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index e09fd1c..0b00c7a 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,8 @@
-# main.py 文件的内容修改为
 import os
 os.system('python Function-21371345.py')
 
+
+
+~
+
+

From 241b0e4814c6966fe4f63a5946690ea4c09401e0 Mon Sep 17 00:00:00 2001
From: Your Name <21373439@buaa.edu.cn>
Date: Sun, 12 Mar 2023 20:36:01 +0800
Subject: [PATCH 3/4] dev

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

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

From ba78800e982eccddbee02e00e8b1c9a13eace4ba Mon Sep 17 00:00:00 2001
From: Your Name <21373439@buaa.edu.cn>
Date: Sun, 12 Mar 2023 20:46:37 +0800
Subject: [PATCH 4/4] try

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

diff --git a/main.py b/main.py
index 0b00c7a..f530ab8 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,5 @@
 import os
+<<<<<<< HEAD
 os.system('python Function-21371345.py')
 
 
@@ -6,3 +7,7 @@ os.system('python Function-21371345.py')
 ~
 
 
+=======
+os.system('python Function-21373439.py')
+os.system('echo Feature-21373439')
+>>>>>>> dev