冲突解决

src/components/area/windturbine/MatrixCard.vue

@@ -1,11 +1,6 @@
 <template>
-<<<<<<< HEAD
   <div class="main" v-if="values.length > 0">
     <div>{{ title }}</div>
-=======
-  <div class="main">
-    <div style="font-size:15px">{{ title }}</div>
->>>>>>> 64c9264e6ca1fb3703e63df00bdc23c878c0dd89
     <div class="content">
       <WindturbineMinCard
         v-for="vs in values"