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>