updata

lingmumu · Feb 10, 2017 · 2af45ce · 2af45ce
2 parents 0f37a2e + 374cf57
commit 2af45ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -142,10 +142,14 @@ npm run build
 生成的elm文件夹放在服务器即可正常访问
 ```
 
+<<<<<<< HEAD
 
 
 
 # 示例
+=======
+# 项目截图
+>>>>>>> 374cf573cefd8c1c0da8fe51bf0364d636352dd8
 
 ## 城市列表页
 

diff --git a/src/images/shop_cart.gif b/src/images/shop_cart.gif