From a4a11127ea839547c533f65f46808539dbb404bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=81=AA=E9=A2=96?= <3139769854@qq.com>
Date: Sun, 16 Apr 2023 17:03:28 +0800
Subject: [PATCH] 2

---
 teammates | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/teammates b/teammates
index 5886794..b8b24f6 100644
--- a/teammates
+++ b/teammates
@@ -1,10 +1,7 @@
 杨腾泽
 孙英皓
 刘彩月
-<<<<<<< HEAD
 李聪颖1
-=======
 李聪颖
 hello world
 goodbye
->>>>>>> a879cff355118113df8336ccf49727504b5d553a