no message

pages/index/index.wxml

@@ -1,16 +1,9 @@
 <!--index.wxml-->
 <view class="container">
-<<<<<<< HEAD
-  <van-tabs class="menu-tabs" active="{{ active }}">
-    <van-tab wx:for="{{navData}}" title="{{item.text}}" wx:key="index">
-      <data-child wx:if="{{item.component === 'data-child'}}"></data-child>
-      <event-child wx:if="{{item.component === 'event-child'}}"></event-child>
-      
-=======
   <van-tabs class="menu-tabs" active="{{ active }}" ellipsis="{{false}}" animated="{{true}}">
     <van-tab wx:for="{{navData}}" title="{{item.text}}">
       <data-child wx:if="{{item.component === 'data-child'}}"></data-child>
->>>>>>> 9cedf606360f218dd16c928fac6b4e34e1911f03
+      <event-child wx:if="{{item.component === 'event-child'}}"></event-child>
     </van-tab>
   </van-tabs>
   <tabbar />