Skip to content

G
gitlab-ce
Commit 674e9351 authored by Fatih Acet's avatar Fatih Acet
Browse files
Options

Remove unnecesarry require.

parent 4fba69dc
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
View file @ 674e9351
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
//= require ./mixins/line_conflict_actions //= require ./mixins/line_conflict_actions
//= require ./components/diff_file_editor //= require ./components/diff_file_editor
//= require ./components/inline_conflict_lines //= require ./components/inline_conflict_lines
//= require ./components/parallel_conflict_line
//= require ./components/parallel_conflict_lines //= require ./components/parallel_conflict_lines
$(() => { $(() => {
......
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