2

2 years ago · a4a11127ea
parent 849d74240d
commit a4a11127ea
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@ -1,10 +1,7 @@
 杨腾泽
 孙英皓
 刘彩月
-<<<<<<< HEAD
 李聪颖1
-=======
 李聪颖
 hello world
 goodbye
->>>>>>> a879cff355118113df8336ccf49727504b5d553a