From d64bb2f9f37e173e3905c63a6d85d77c0f1fa4dc Mon Sep 17 00:00:00 2001
From: luoye <397379429@qq.com>
Date: Mon, 14 Aug 2017 14:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
index 6488514..efb84f5 100644
--- a/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
+++ b/littleApp_child/pages/childcare_knowledge/childcare_knowledge.wxml
@@ -27,13 +27,8 @@
                             <view style="margin-left:15px;margin-right:75px;">
                                 <view class="content_title">{{item.title}}</view>
                                 <view class="content_content">{{item.introduction}}</view>
-<<<<<<< HEAD
-                                <view class="zar_box">
-                                    <image class="zar_img" src="../../source/like.png"></image>
-=======
                                 <view class="zar_box" bindtap="articleLike" data-categaryIndex="{{sectionIndex}}" data-artIndex="{{index}}">
                                     <image class="zar_img" src="../../source/{{item.isLike == 1 ? 'zanguo.png' : 'like.png'}}"></image>
->>>>>>> c0652f9e89ff8c2538249d6ec04fdfcb0b5777f2
                                     <view class="content_zar">{{item.likeCount}}</view>
                                 </view>
 
-- 
1.8.3.1