rev 冲突

acs/nladmin-ui/src/layout/components/Navbar.vue

@@ -31,7 +31,7 @@
         <el-dropdown-menu slot="dropdown">
           <span style="display:block;" @click="show = true">
             <el-dropdown-item>
-               {{ $t('common.Layout_setting') }}
+              {{ $t('common.Layout_setting') }}
             </el-dropdown-item>
           </span>
           <router-link to="/user/center">
@@ -46,7 +46,7 @@
           </span>
         </el-dropdown-menu>
       </el-dropdown>
-      <el-dropdown class="right-menu-item"  trigger="click" @command="langChange">
+      <el-dropdown class="right-menu-item" trigger="click" @command="langChange">
         <span class="el-dropdown-link">
           {{ language }} <i class="el-icon-caret-bottom" />
         </span>