Me

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