diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-24 00:10:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-24 00:10:24 +0300 |
| commit | 5838993b5f3e2d861d9dd7c82dfeea71506b9fc2 (patch) | |
| tree | caab6621fb79f06a355f802dc885982f746b544d /app/assets/javascripts/merge_conflicts/components/diff_file_editor.js | |
| parent | b8d021cb606ac86f41a0ef9dacd133a9677f8414 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/diff_file_editor.js')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js index 8cb4d77dc19..338fbd9078a 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js @@ -6,7 +6,7 @@ import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as flash } from '~/flash'; import { __ } from '~/locale'; -(global => { +((global) => { global.mergeConflicts = global.mergeConflicts || {}; global.mergeConflicts.diffFileEditor = Vue.extend({ |