Remove unnecesarry require.

2016-11-08 17:46:01 +03:00 · 2016-11-08 17:46:01 +03:00 · 674e9351e1
parent 4fba69dc90
commit 674e9351e1
1 changed files with 0 additions and 1 deletions
--- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
+++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
@ -6,7 +6,6 @@
 //= require ./mixins/line_conflict_actions
 //= require ./components/diff_file_editor
 //= require ./components/inline_conflict_lines
-//= require ./components/parallel_conflict_line
 //= require ./components/parallel_conflict_lines

 $(() => {