解决冲突

src/views/consultant/list.vue

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
   <div class="content my-content">
     <!-- 头部 -->
     <div :class="{ header: true, 'scroll white': isScrollTop, white: true }">
@@ -7,13 +6,6 @@
         <img src="../../assets/images/home/expert/back.png" alt="" />
       </div>
       <div class="header-title">列表预览</div>
-=======
-    <div class="content">
-		<!-- 头部 -->
-		<div :class="{'header':true,'scroll white':isScrollTop,'white':true}">
-			<div class="back" @click="$router.go(-1)"><img src="../../assets/images/home/expert/back.png" alt=""></div>
-			<div class="header-title">列表预览</div>
-		</div>
 		<!-- 咨询师列表 -->
 		<div class="expert-list-all section">
 			<ul class="expert-list">
@@ -245,15 +237,7 @@ userData:{},
 </script>
 
 <style scoped>
-<<<<<<< HEAD
-.expert-list>li{
-}
-.my-content{
-	padding-top: 1rem;
-}
-=======
 	.expert-list{
 		margin-top: 1.2rem;
 	}
->>>>>>> 31ac1df69ae7462dac9a9171cb8e6856291e7c2a
 </style>