diff options
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_store.js')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index 693f0b619a8..fb3444262ea 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js @@ -1,8 +1,8 @@ /* eslint-disable no-param-reassign, babel/camelcase, no-nested-ternary, no-continue */ import $ from 'jquery'; -import Vue from 'vue'; import Cookies from 'js-cookie'; +import Vue from 'vue'; import { s__ } from '~/locale'; ((global) => { |