Skip to content

G
gitlab-ce
Commit 38422b35 authored by Bryce Johnson's avatar Bryce Johnson
Browse files
Options

Temporarily revert removal of vue require in conflicts bundle.

parent 51bdd204
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
View file @ 38422b35
/* eslint-disable */ /* eslint-disable */
//= require vue
//= require ./merge_conflict_store //= require ./merge_conflict_store
//= require ./merge_conflict_service //= require ./merge_conflict_service
//= require ./mixins/line_conflict_utils //= require ./mixins/line_conflict_utils
......
Markdown is supported
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7