diff options
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue')
-rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue index 7168efa28ad..707e8a0645f 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.vue @@ -2,7 +2,7 @@ import { GlButton } from '@gitlab/ui'; import { debounce } from 'lodash'; import { mapActions } from 'vuex'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; import { INTERACTIVE_RESOLVE_MODE } from '../constants'; @@ -75,7 +75,7 @@ export default { }, ) .catch(() => { - createFlash({ + createAlert({ message: __('An error occurred while loading the file'), }); }); |