no message

src/components/systemManagement/stationManagement.vue

@@ -63,15 +63,10 @@
             <el-option key="1" :label="$t('system.ph_shanchu')" value="1"></el-option>
           </el-select>
         </li>
-<<<<<<< HEAD
-        <li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
-          <input type="button" class="normalBtn" :value="$t('fnc.tianjia')" @click="initAddMsg(),outerVisible=true,dialogTitle='新增车站'" /></li>
-=======
         <li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
             @click="resetPageIndex(),getList()" />
-          <input type="button" class="normalBtn" value="添加"
+          <input type="button" class="normalBtn" :value="$t('fnc.tianjia')"
             @click="initAddMsg(),outerVisible=true,dialogTitle='新增车站'" /></li>
->>>>>>> master
       </ul>
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">