From 09c612fe38b02270a74cc444851e4d00876f8792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=89=AC?= <21373135>
Date: Sun, 12 Mar 2023 11:04:59 +0800
Subject: [PATCH 01/14] add_main

---
 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..18f5c6e
--- /dev/null
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21373135.py')
-- 
2.34.1


From 181e0ec99ba399e49c670ad95d9a934bffd71d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=89=91=E9=A3=9E?= <21373129>
Date: Sun, 12 Mar 2023 12:33:13 +0800
Subject: [PATCH 02/14] 21373129

---
 Function-21373129.py | 1 +
 main.py              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 Function-21373129.py

diff --git a/Function-21373129.py b/Function-21373129.py
new file mode 100644
index 0000000..a2298e2
--- /dev/null
+++ b/Function-21373129.py
@@ -0,0 +1 @@
+print('My Student_ID is 学号')
diff --git a/main.py b/main.py
index a15fcca..458c997 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
 import os
-os.system('python Function-21371334.py')
\ No newline at end of file
+os.system('python Function-21373129.py')
-- 
2.34.1


From 8006cd15998b4c77e31628922b1834cabf3ec7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=89=91=E9=A3=9E?= <21373129>
Date: Sun, 12 Mar 2023 12:50:59 +0800
Subject: [PATCH 03/14] new

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

diff --git a/Fuction-21371334.py b/Function-21371334.py
similarity index 100%
rename from Fuction-21371334.py
rename to Function-21371334.py
-- 
2.34.1


From 2a6b401eda2fa42a7719224904f9f83e368b7415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=89=AC?= <21373135>
Date: Sun, 12 Mar 2023 18:53:04 +0800
Subject: [PATCH 04/14] add_main

---
 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..cb6df6d
--- /dev/null
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21373138.py')
-- 
2.34.1


From 6fc47ffb28fb3f6a6e451c3bf73c461cca4df0e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E5=8E=9A=E6=95=AC?= <21373138>
Date: Sun, 12 Mar 2023 19:06:41 +0800
Subject: [PATCH 05/14] 21373138

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

diff --git a/main.py b/main.py
index cb6df6d..e788573 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
 import os
-os.system('python Function-21373138.py')
+os.system('python Function-2137313.py')
-- 
2.34.1


From 3381bec46f710b4095aadb0c07114d6f2738c580 Mon Sep 17 00:00:00 2001
From: Heyukai <1626784885@qq.com>
Date: Sun, 12 Mar 2023 19:08:52 +0800
Subject: [PATCH 06/14] 21371334

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

diff --git a/Fuction-21371334.py b/Fuction-21371334.py
index 9449ebe..27a7aa0 100644
--- a/Fuction-21371334.py
+++ b/Fuction-21371334.py
@@ -1 +1 @@
-print('My Student_ID is 学号')
\ No newline at end of file
+print('My Student_ID is 21371334')
\ No newline at end of file
-- 
2.34.1


From f60c781acc331d45274b2a4903893c0ca9e32c5d Mon Sep 17 00:00:00 2001
From: Heyukai <1626784885@qq.com>
Date: Sun, 12 Mar 2023 19:16:03 +0800
Subject: [PATCH 07/14] 21371334

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

diff --git a/Fuction-21371334.py b/Function-21371334.py
similarity index 100%
rename from Fuction-21371334.py
rename to Function-21371334.py
-- 
2.34.1


From b4ae74f035a5c6d0fa419d412e523aa8ab68099e Mon Sep 17 00:00:00 2001
From: Heyukai <1626784885@qq.com>
Date: Sun, 12 Mar 2023 19:36:09 +0800
Subject: [PATCH 08/14] 21371334

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b638918..e4c7640 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # BUAA-SE-2023-Lab01-Group20
-
+1
-- 
2.34.1


From de4c348189cb80caf13169535913ea35721aa632 Mon Sep 17 00:00:00 2001
From: Heyukai <1626784885@qq.com>
Date: Sun, 12 Mar 2023 19:36:47 +0800
Subject: [PATCH 09/14] Conflict Solved

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e4c7640..b638918 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # BUAA-SE-2023-Lab01-Group20
-1
+
-- 
2.34.1


From 11998ea7e856f415758374162155238d63fd8c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AD=90=E6=81=92?= <21371363>
Date: Sun, 12 Mar 2023 20:44:02 +0800
Subject: [PATCH 10/14] test

---
 Function-21371363.py | 1 +
 Function-21373138.py | 1 -
 main.py              | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 Function-21371363.py
 delete mode 100644 Function-21373138.py
 create mode 100644 main.py

diff --git a/Function-21371363.py b/Function-21371363.py
new file mode 100644
index 0000000..2684544
--- /dev/null
+++ b/Function-21371363.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371363')
diff --git a/Function-21373138.py b/Function-21373138.py
deleted file mode 100644
index 71ca176..0000000
--- a/Function-21373138.py
+++ /dev/null
@@ -1 +0,0 @@
-print('My Student_ID is 21373138')
\ No newline at end of file
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..04c9e79
--- /dev/null
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21371363.py')
-- 
2.34.1


From 5a5c55f5b5261858b0c5275c53cc5df81a409e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AD=90=E6=81=92?= <21371363>
Date: Sun, 12 Mar 2023 21:03:12 +0800
Subject: [PATCH 11/14] 1

---
 Function-21371363.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Function-21371363.py b/Function-21371363.py
index 3c3d0fb..2684544 100644
--- a/Function-21371363.py
+++ b/Function-21371363.py
@@ -1,7 +1 @@
-<<<<<<< HEAD
-# Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371363')
-print('My Name is 陈子恒')
-=======
-print('My Student_ID is 21371363')
->>>>>>> Student-21371363
-- 
2.34.1


From 21d9db4d02ad51fbab077c58193716151b7f5792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AD=90=E6=81=92?= <21371363>
Date: Sun, 12 Mar 2023 21:08:53 +0800
Subject: [PATCH 12/14] 21373138

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

diff --git a/Function-21373138.py b/Function-21373138.py
index 71ca176..d959c86 100644
--- a/Function-21373138.py
+++ b/Function-21373138.py
@@ -1 +1 @@
-print('My Student_ID is 21373138')
\ No newline at end of file
+.print('My Student_ID is 21373138')
-- 
2.34.1


From 94ed0263b21f0b26110b5a832a97efaf2b82b363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AD=90=E6=81=92?= <21371363>
Date: Sun, 12 Mar 2023 21:09:07 +0800
Subject: [PATCH 13/14] 21373138

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

diff --git a/Function-21373138.py b/Function-21373138.py
index d959c86..f4b9d36 100644
--- a/Function-21373138.py
+++ b/Function-21373138.py
@@ -1 +1 @@
-.print('My Student_ID is 21373138')
+print('My Student_ID is 21373138')
-- 
2.34.1


From c878fc63dbf9ec016bbd1bd7fac7d47005524e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AD=90=E6=81=92?= <21371363>
Date: Sun, 12 Mar 2023 21:22:59 +0800
Subject: [PATCH 14/14] 21371363

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

diff --git a/Function-21371363.py b/Function-21371363.py
index 2684544..3efa6d0 100644
--- a/Function-21371363.py
+++ b/Function-21371363.py
@@ -1 +1,3 @@
+# Function-学号.py 文件的内容修改为
 print('My Student_ID is 21371363')
+print('My Name is 陈子恒')
-- 
2.34.1