Remove unnecesarry require.

674e9351 · Fatih Acet · 4fba69dc · 674e9351
Commit 674e9351 authored Nov 08, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 ...javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 +0 -1

No files found.
--- 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

 $(() => {