fixed

src/pages/contractSigning/contract-detail.vue

@@ -157,13 +157,8 @@
             <img :src="agentPic" alt="" class="read">
           </div>
           <div slot="content" class="in-detail" @click="goContractContent('经销商担保协议')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
-<<<<<<< HEAD
         </item> -->
-        <item :proportion="[5,1]">
-=======
-        </item>-->
         <item :proportion="[4,1]">
->>>>>>> liuxin
           <div slot="name" class="aguremrnt-list">
             <img src="@/assets/constractSigning/pack.png" alt class="pics" >
             <p class="second">租赁物所有权转移及接收确认书</p>