Commit d2deb026 authored by Maxim Filippov's avatar Maxim Filippov 🌚
Browse files

Merge branch 'fix/linter' into 'master'

Linter fixes

See merge request pleroma/admin-fe!33
parents 0241c3d0 64c82c5b
...@@ -2,9 +2,8 @@ import Vue from 'vue' ...@@ -2,9 +2,8 @@ import Vue from 'vue'
import VueI18n from 'vue-i18n' import VueI18n from 'vue-i18n'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang
import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN' // element-ui lang
import elementEsLocale from 'element-ui/lib/locale/lang/es'// element-ui lang import elementEsLocale from 'element-ui/lib/locale/lang/es' // element-ui lang
import elementOcLocale from 'element-ui/lib/locale/lang/oc' //element-ui lang
import enLocale from './en' import enLocale from './en'
import zhLocale from './zh' import zhLocale from './zh'
import esLocale from './es' import esLocale from './es'
...@@ -27,7 +26,6 @@ const messages = { ...@@ -27,7 +26,6 @@ const messages = {
}, },
oc: { oc: {
...ocLocale ...ocLocale
...elementOcLocale
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment