From ddea5c2a5518aa6d4fd9ebd31102c1777798c38a Mon Sep 17 00:00:00 2001
From: lyz <21371188>
Date: Sat, 11 Mar 2023 16:18:58 +0800
Subject: [PATCH 1/7] 1

---
 main.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 main.py

diff --git a/main.py b/main.py
new file mode 100644
index 0000000..e69de29

From 264ea9c794328a0de020610e3adc37c83294ae48 Mon Sep 17 00:00:00 2001
From: frb <21371258>
Date: Sat, 11 Mar 2023 08:27:21 +0000
Subject: [PATCH 2/7] 1

---
 Function-21371258.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Function-21371258.py

diff --git a/Function-21371258.py b/Function-21371258.py
new file mode 100644
index 0000000..fdbcdc3
--- /dev/null
+++ b/Function-21371258.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371258')
\ No newline at end of file

From 5d31e306287d1db72dc8ec7a4c49771cc9df51c1 Mon Sep 17 00:00:00 2001
From: lyz <21371188>
Date: Sat, 11 Mar 2023 16:56:10 +0800
Subject: [PATCH 3/7] 2

---
 Function-21371188.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Function-21371188.py

diff --git a/Function-21371188.py b/Function-21371188.py
new file mode 100644
index 0000000..f2f46f9
--- /dev/null
+++ b/Function-21371188.py
@@ -0,0 +1 @@
+print('我的学号是21371188')
\ No newline at end of file

From 35d17fc383e98f3574a18ca4821ab1d80fe72311 Mon Sep 17 00:00:00 2001
From: zzh <21371274>
Date: Sat, 11 Mar 2023 08:56:57 +0000
Subject: [PATCH 4/7] 21371274

---
 Function-21371274.py | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Function-21371274.py

diff --git a/Function-21371274.py b/Function-21371274.py
new file mode 100644
index 0000000..9f7e01a
--- /dev/null
+++ b/Function-21371274.py
@@ -0,0 +1,2 @@
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371274')
\ No newline at end of file

From 7e26c06284c0a1047316a1531a327e6ca2c527d6 Mon Sep 17 00:00:00 2001
From: frb <21371258>
Date: Sat, 11 Mar 2023 08:59:41 +0000
Subject: [PATCH 5/7] 2

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

diff --git a/main.py b/main.py
index e69de29..4a1b47f 100644
--- a/main.py
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21371258.py')
\ No newline at end of file

From 3c0ce993712a24030a41fe2c32307bf75b7fff91 Mon Sep 17 00:00:00 2001
From: lyz <21371188>
Date: Sat, 11 Mar 2023 17:41:20 +0800
Subject: [PATCH 6/7] 3

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

diff --git a/main.py b/main.py
index e69de29..069aab5 100644
--- a/main.py
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21371188.py')
\ No newline at end of file

From 7d607d4898905ea0cda7ed97f9193dbe150ee82e Mon Sep 17 00:00:00 2001
From: lyz <21371188>
Date: Sat, 11 Mar 2023 17:51:37 +0800
Subject: [PATCH 7/7] 4

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

diff --git a/main.py b/main.py
index ef01faa..069aab5 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371258.py')
-=======
-os.system('python Function-21371188.py')
->>>>>>> Student-21371188
+os.system('python Function-21371188.py')
\ No newline at end of file