diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-08 17:46:01 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-10 17:53:34 +0300 |
| commit | 674e9351e16d22edd5dac0c7fa29b79fcd84650b (patch) | |
| tree | ad0f6db87c987c6b87c9f565b6c4ec8765a7d28a | |
| parent | 4fba69dc90d9c423f491f58b62a9d814d07d7ef2 (diff) | |
| download | gitlab-ce-674e9351e16d22edd5dac0c7fa29b79fcd84650b.tar.gz | |
Remove unnecesarry require.
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6 index 03a642d7ff2..815443fb54e 100644 --- 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 $(() => { |