Merge branch

2 years ago · 169c3eefde
parent 918b09860c 8ccfa825b2
commit 169c3eefde
1 changed files with 7 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -15,5 +15,11 @@
 -你猜我是谁
 -我不想猜你是谁
 -那你到底是谁
+<<<<<<< HEAD
 -你不告诉我算了
-我不告诉你
+-我不告诉你
+=======
+你不告诉我算了
+-我不告诉你
+-你知道了吗
+>>>>>>> 刘彩月