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] 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