From a5ffed34ac3c60ab4709e13225f422efe112285e Mon Sep 17 00:00:00 2001
From: luochuan <21371427>
Date: Sat, 11 Mar 2023 20:44:48 +0800
Subject: [PATCH 1/6] 1

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

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

From e841b604e2cdde0521d44b3471ac5729bc006457 Mon Sep 17 00:00:00 2001
From: luochuan <21371427>
Date: Sat, 11 Mar 2023 20:46:24 +0800
Subject: [PATCH 2/6] 1

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

diff --git a/Function-21371427.py b/Function-21371427.py
index e69de29..1da13de 100644
--- a/Function-21371427.py
+++ b/Function-21371427.py
@@ -0,0 +1 @@
+print('My Student_ID is 21371427')
\ No newline at end of file

From d5a6b60adf876dab53cefff25547f2c061092568 Mon Sep 17 00:00:00 2001
From: JQKonatsu <zwj1813@163.com>
Date: Sat, 11 Mar 2023 20:48:16 +0800
Subject: [PATCH 3/6] modify main.py

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

From 65547868848e1443cb21672c3d2a08bbbba7de23 Mon Sep 17 00:00:00 2001
From: luochuan <21371427>
Date: Sat, 11 Mar 2023 20:48:16 +0800
Subject: [PATCH 4/6] 1

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

From 132f11705bf59469da42359f5b10335da3966804 Mon Sep 17 00:00:00 2001
From: ling <18016855@qq.com>
Date: Sat, 11 Mar 2023 20:48:47 +0800
Subject: [PATCH 5/6] 1

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

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

From 418c126ff95c401e952cdb4afce3e880b74c6484 Mon Sep 17 00:00:00 2001
From: luochuan <21371427>
Date: Sat, 11 Mar 2023 20:54:17 +0800
Subject: [PATCH 6/6] Conflict Solved

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

diff --git a/main.py b/main.py
index e232c4b..752d2b8 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371427.py')
-=======
 os.system('python Function-21371434.py')
->>>>>>> eb19cf0a280dd1bfae38bbea315c6af03ada4c75