From cd4224b47c491c1d323127a4ab87847299ca5bb8 Mon Sep 17 00:00:00 2001
From: AlpaCa <2604307870@qq.com>
Date: Sat, 11 Mar 2023 16:54:50 +0800
Subject: [PATCH 01/22] 8-yhf
---
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..aa73295
--- /dev/null
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21373067.py')
\ No newline at end of file
From 22722225f3a4a81ea6f40001c5e1e7fb32735a9a Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Sat, 11 Mar 2023 17:04:08 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9py=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Function-21371396.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Function-21371396.py b/Function-21371396.py
index 77d720e..74345ad 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1 +1,2 @@
-print('My Student_ID is 21371396')
\ No newline at end of file
+import os
+os.system('python Function-学号.py')
\ No newline at end of file
From d4620e5241aebc4bba194f30dbadd165c2a77d03 Mon Sep 17 00:00:00 2001
From: zhr <1340585346@qq.com>
Date: Sat, 11 Mar 2023 17:37:30 +0800
Subject: [PATCH 03/22] test
---
main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.py b/main.py
index aa73295..aacc2a3 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
import os
-os.system('python Function-21373067.py')
\ No newline at end of file
+os.system('python Function-21371101.py')
\ No newline at end of file
From 6005b0eb18db8a396a8fd560bea4c7a1c2fd125e Mon Sep 17 00:00:00 2001
From: zhr <1340585346@qq.com>
Date: Sat, 11 Mar 2023 17:39:28 +0800
Subject: [PATCH 04/22] test
---
main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.py b/main.py
index aacc2a3..aa73295 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
import os
-os.system('python Function-21371101.py')
\ No newline at end of file
+os.system('python Function-21373067.py')
\ No newline at end of file
From 2aa55d3ce0150fe6270f2233076b08929ea2478a Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Sat, 11 Mar 2023 18:50:58 +0800
Subject: [PATCH 05/22] change py
---
Function-21371396.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Function-21371396.py b/Function-21371396.py
index 74345ad..a6e36a4 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1,2 +1 @@
-import os
-os.system('python Function-学号.py')
\ No newline at end of file
+print('My Student_ID is 21371101')
\ No newline at end of file
From 0bb6a6d16db7cde5719566882e7feb58ade7a145 Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Sat, 11 Mar 2023 18:53:05 +0800
Subject: [PATCH 06/22] .
---
Function-21371396.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Function-21371396.py b/Function-21371396.py
index a6e36a4..77d720e 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1 +1 @@
-print('My Student_ID is 21371101')
\ No newline at end of file
+print('My Student_ID is 21371396')
\ No newline at end of file
From 592674905e65e97f7c6ff3f56daea4a5386a1319 Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Sat, 11 Mar 2023 18:55:56 +0800
Subject: [PATCH 07/22] 21371396
---
main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.py b/main.py
index aa73295..0d71d83 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
import os
-os.system('python Function-21373067.py')
\ No newline at end of file
+os.system('python Function-21371396.py')
\ No newline at end of file
From 8b5cf104749f55f3417d983958df446f8339a445 Mon Sep 17 00:00:00 2001
From: AlpaCa <2604307870@qq.com>
Date: Sat, 11 Mar 2023 19:02:07 +0800
Subject: [PATCH 08/22] solve
---
main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.py b/main.py
index 0d71d83..aa73295 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
import os
-os.system('python Function-21371396.py')
\ No newline at end of file
+os.system('python Function-21373067.py')
\ No newline at end of file
From 007572a898ea05332a11e06d999aa2ebf534e267 Mon Sep 17 00:00:00 2001
From: zhr <1340585346@qq.com>
Date: Sat, 11 Mar 2023 19:03:20 +0800
Subject: [PATCH 09/22] ttest
---
main.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/main.py b/main.py
index 32990f8..d17f07d 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,2 @@
-# main.py 文件的内容修改为
import os
os.system('python Function-21371101.py')
From d4b11980dea87f55f503eaaa4e23660cc6cd7e69 Mon Sep 17 00:00:00 2001
From: zhr <1340585346@qq.com>
Date: Sat, 11 Mar 2023 20:05:19 +0800
Subject: [PATCH 10/22] test
---
main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.py b/main.py
index d17f07d..792b402 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,2 @@
import os
-os.system('python Function-21371101.py')
+os.system('python Function-21371101.py')
From 76d3020b09d5f85431e3965491df064207b4d112 Mon Sep 17 00:00:00 2001
From: AlpaCa <2604307870@qq.com>
Date: Sat, 11 Mar 2023 20:13:52 +0800
Subject: [PATCH 11/22] Conflict Solved
---
main.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/main.py b/main.py
index f28c86c..5d78362 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,2 @@
import os
-<<<<<<< HEAD
os.system('python Function-21373067.py')
-=======
-os.system('python Function-21371101.py')
->>>>>>> Student-21371101
From 712b367fcf5925eb658d1b2ceab45e6f01f10578 Mon Sep 17 00:00:00 2001
From: zhr <1340585346@qq.com>
Date: Sun, 12 Mar 2023 22:09:13 +0800
Subject: [PATCH 12/22] try
---
Function-21371101.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Function-21371101.py b/Function-21371101.py
index 8129d20..82701f2 100644
--- a/Function-21371101.py
+++ b/Function-21371101.py
@@ -1,2 +1,2 @@
-# Function-学号.py 文件的内容修改为
print('My Student_ID is 21371101')
+print('My Name is 张昊然')
From 27ead23f91f176b27ac0055538abffb3466fb18d Mon Sep 17 00:00:00 2001
From: AlpaCa <2604307870@qq.com>
Date: Mon, 13 Mar 2023 08:06:06 +0800
Subject: [PATCH 13/22] 10-4-yhf
---
Function-21373067.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Function-21373067.py b/Function-21373067.py
index 0999342..572b928 100644
--- a/Function-21373067.py
+++ b/Function-21373067.py
@@ -1 +1,2 @@
-print('My Student_ID is 21373067')
\ No newline at end of file
+print('My Student_ID is 21373067')
+print('My Name is 杨宏飞')
\ No newline at end of file
From 474994c199f60f557e30e2c5863721dc7e4ec316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=B6=E4=BD=91=E9=B9=8F?= <21373081>
Date: Mon, 13 Mar 2023 08:51:26 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E6=96=B0=E5=88=86=E6=94=AF=E6=8E=A8?=
=?UTF-8?q?=E9=80=81=E8=87=B3=E5=90=84=E8=87=AA=E7=9A=84=E8=BF=9C=E7=A8=8B?=
=?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/main.py b/main.py
index 5d78362..c62a7cf 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,4 @@
import os
-os.system('python Function-21373067.py')
+import os
+os.system('python Function-21373081.py')
+os.system('echo Feature-21373081')
From 3f017f2865ebe61b9bb0e40f0bde70d4d381c4fc Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Mon, 13 Mar 2023 09:30:50 +0800
Subject: [PATCH 15/22] .
---
Function-21371396.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Function-21371396.py b/Function-21371396.py
index 77d720e..af1d321 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1 +1,3 @@
-print('My Student_ID is 21371396')
\ No newline at end of file
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 学号')
+print('My Name is 姓名')
\ No newline at end of file
From 8db4b70d296ad2773d89f8d5d8b84ea8b0ea1e57 Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Mon, 13 Mar 2023 09:53:36 +0800
Subject: [PATCH 16/22] change
---
Function-21371396.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Function-21371396.py b/Function-21371396.py
index af1d321..45ac605 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1,3 +1,5 @@
# Function-学号.py 文件的内容修改为
print('My Student_ID is 学号')
-print('My Name is 姓名')
\ No newline at end of file
+# Function-学号.py 文件的内容修改为
+print('My Student_ID is 21371396')
+print('My Name is 孙宇航')
\ No newline at end of file
From 9e6964f0a74be46b5986cfa910ea6b6ed17a1a0a Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Mon, 13 Mar 2023 10:50:59 +0800
Subject: [PATCH 17/22] ..
---
Function-21371396.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Function-21371396.py b/Function-21371396.py
index 45ac605..7c384bf 100644
--- a/Function-21371396.py
+++ b/Function-21371396.py
@@ -1,5 +1,2 @@
# Function-学号.py 文件的内容修改为
-print('My Student_ID is 学号')
-# Function-学号.py 文件的内容修改为
print('My Student_ID is 21371396')
-print('My Name is 孙宇航')
\ No newline at end of file
From 16d8332db8667eab8627593bbb1db0817bcd20b9 Mon Sep 17 00:00:00 2001
From: buaa21371396 <3056161580@qq.com>
Date: Mon, 13 Mar 2023 10:54:29 +0800
Subject: [PATCH 18/22] ...
---
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..0d71d83
--- /dev/null
+++ b/main.py
@@ -0,0 +1,2 @@
+import os
+os.system('python Function-21371396.py')
\ No newline at end of file
From 593176b4c2ef5ec5d316b386ea75a43ae6c0965a Mon Sep 17 00:00:00 2001
From: Gabriel1159 <gabriel1159@163.com>
Date: Mon, 13 Mar 2023 11:10:36 +0800
Subject: [PATCH 19/22] Conflict Solved
---
Function-20231159.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Function-20231159.py b/Function-20231159.py
index f148b5e..cb2d832 100644
--- a/Function-20231159.py
+++ b/Function-20231159.py
@@ -1 +1 @@
-print('My Student_ID is 20231159')
+print('My Student_ID is 20231159')
From 3ffcd053fda57f8c013ac4cdd8aa973c47907a47 Mon Sep 17 00:00:00 2001
From: Gabriel1159 <gabriel1159@163.com>
Date: Mon, 13 Mar 2023 11:28:05 +0800
Subject: [PATCH 20/22] 0313
---
Function-20231159.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Function-20231159.py b/Function-20231159.py
index f148b5e..6159e74 100644
--- a/Function-20231159.py
+++ b/Function-20231159.py
@@ -1 +1,3 @@
+# encoding:utf-8
print('My Student_ID is 20231159')
+print('My Name is 赵子璁')
From 043690a86165116d639ea1877eda24cc7a4fac8e Mon Sep 17 00:00:00 2001
From: AlpaCa <2604307870@qq.com>
Date: Mon, 13 Mar 2023 11:42:46 +0800
Subject: [PATCH 21/22] 10.3.5
---
main.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/main.py b/main.py
index 5d78362..68f4d1a 100644
--- a/main.py
+++ b/main.py
@@ -1,2 +1,3 @@
import os
os.system('python Function-21373067.py')
+os.system('echo Feature-21373067')
\ No newline at end of file
From 13e5a756c631e4abc856946638a1ce547f561d7e Mon Sep 17 00:00:00 2001
From: Gabriel1159 <gabriel1159@163.com>
Date: Mon, 13 Mar 2023 12:07:04 +0800
Subject: [PATCH 22/22] 0313
---
main.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main.py b/main.py
index 68f4d1a..f1c0f04 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,3 @@
import os
-os.system('python Function-21373067.py')
-os.system('echo Feature-21373067')
\ No newline at end of file
+os.system('python Function-20231159.py')
+os.system('echo Feature-20231159')