From 20f27d0541deb3c30e33bdd4bbed659bf7c1c859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B8=A9=E5=AE=87=E7=BF=94?= <22373297>
Date: Wed, 20 Mar 2024 09:07:32 +0800
Subject: [PATCH 1/3] Conflict Solved

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

diff --git a/Function-22373306.py b/Function-22373306.py
index 4994e12..dac0f5e 100644
--- a/Function-22373306.py
+++ b/Function-22373306.py
@@ -1,5 +1 @@
-<<<<<<< HEAD
-print(My Student_ID is 22373306)
-=======
-print(My Id is 22373306)
->>>>>>> Student-22373306
+print('My Student_ID is 22373306')
-- 
Gitee


From 014dcd6cc693ca26c814e9076e09c7ed65e1d45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B8=A9=E5=AE=87=E7=BF=94?= <22373297>
Date: Wed, 20 Mar 2024 09:11:25 +0800
Subject: [PATCH 2/3] Conflict Solved

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

diff --git a/main.py b/main.py
index 9d3549c..7f3855e 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,2 @@
-# main.py 文件的内容修改为
 import os
 os.system('python Function-22373297.py')
-- 
Gitee


From dc2b44e689436db0af833b150ac1ce91ad962a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B8=A9=E5=AE=87=E7=BF=94?= <22373297>
Date: Wed, 20 Mar 2024 09:36:26 +0800
Subject: [PATCH 3/3] mcy

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

diff --git a/Function-22373306.py b/Function-22373306.py
index dac0f5e..130e28b 100644
--- a/Function-22373306.py
+++ b/Function-22373306.py
@@ -1 +1 @@
-print('My Student_ID is 22373306')
+print('My Student_ID is 22373306')     
-- 
Gitee