modify

components/common/icon/src/icon.vue

 <template>
-<<<<<<< HEAD
-  <i :class="'iconfont yun-icon--' + name" :style="{fontSize:size,color:nowColor,cursor:cursor,verticalAlign:vertical,paddingBottom:pb}" @mouseenter="changeStyle1" @mouseout="changeStyle2"></i>
-=======
-  <i :class="'iconfont yun-icon--' + name" :style="{fontSize:size,color:nowColor,transition:'.5s ease',cursor:cursor,verticalAlign:'middle'}" @mouseenter="changeStyle1" @mouseout="changeStyle2"></i>
->>>>>>> 977a273fde2a48e90ed7d1fd29c36cc7679722a5
+  <i :class="'iconfont yun-icon--' + name" :style="{fontSize:size,color:nowColor,transition:'.5s ease',cursor:cursor,verticalAlign:vertical,paddingBottom:pb}" @mouseenter="changeStyle1" @mouseout="changeStyle2"></i>
 </template>
 
 <script>
@@ -14,15 +10,9 @@
       name: String,
       size: String,
       color: String,
-<<<<<<< HEAD
-      hoverColor:{
-        type:String,
-      },
       pb:String,
       vertical:String,
-=======
       hoverColor:String,
->>>>>>> 977a273fde2a48e90ed7d1fd29c36cc7679722a5
       canClick:{
         type:Boolean,
         default:true,

pages/index.vue

@@ -3,14 +3,9 @@
     <div>
       <banner></banner>
       <h1 class="title">
-        beyond-clouds-front
       </h1>
-<<<<<<< HEAD
       <comment-card></comment-card>
-      <comment-card></comment-card>
-      <comment-card></comment-card>
-      <comment-card></comment-card>
-=======
+
       <project-card></project-card>
       <answer-card></answer-card>
       <my-answer></my-answer>
@@ -18,8 +13,7 @@
       <h2 class="subtitle" @click="showAlert">
         beyond-clouds project
       </h2>
->>>>>>> 977a273fde2a48e90ed7d1fd29c36cc7679722a5
-    </div>
+</div>
   </div>
 </template>
 
@@ -27,16 +21,13 @@
 
 import Banner from '../components/pc/banner';
 import ProjectCard from '../components/pc/projectCard';
-<<<<<<< HEAD
 import Pagination from '../components/pc/pagination';
 import Avatar from '../components/common/avatar/avatar';
 import CommentCard from '../components/pc/commentCard';
 
-=======
 import AnswerCard from '../components/pc/answerCard';
 import MyAnswer from '../components/pc/myAnswer';
 import TopicListCard from '../components/pc/topicListCard';
->>>>>>> 977a273fde2a48e90ed7d1fd29c36cc7679722a5
 
 export default {
 
@@ -46,11 +37,9 @@ export default {
     }
   },
   components:{
-<<<<<<< HEAD
+
     Banner,ProjectCard,Pagination,Avatar,CommentCard
-=======
-    Banner,ProjectCard,AnswerCard,MyAnswer,TopicListCard
->>>>>>> 977a273fde2a48e90ed7d1fd29c36cc7679722a5
+
   },
 
   methods:{