'add'

6 years ago · 297c244437
parent f454016a72
commit 297c244437
1 changed files with 0 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # 手把手教你用vue+node+mongodb搭建一个小商城


@ -87,6 +86,3 @@



-=======
-分类详情页之better-scroll实现滚动
->>>>>>> chapter21