Skip to content
Snippets Groups Projects
Commit 1cbdd212 authored by Maxim Filippov's avatar Maxim Filippov :new_moon_with_face:
Browse files

Linter fixes

parent 0241c3d0
No related branches found
No related tags found
1 merge request!33Linter fixes
This commit is part of merge request !33. Comments created here will be created in the context of that merge request.
...@@ -2,9 +2,9 @@ import Vue from 'vue' ...@@ -2,9 +2,9 @@ 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 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'
...@@ -26,7 +26,7 @@ const messages = { ...@@ -26,7 +26,7 @@ const messages = {
...elementEsLocale ...elementEsLocale
}, },
oc: { oc: {
...ocLocale ...ocLocale,
...elementOcLocale ...elementOcLocale
} }
} }
......
...@@ -158,4 +158,4 @@ export default { ...@@ -158,4 +158,4 @@ export default {
closeOthers: 'Tampar los autres', closeOthers: 'Tampar los autres',
closeAll: 'Los tampar totes' closeAll: 'Los tampar totes'
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment