diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-11 06:13:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-11 06:13:45 +0300 |
| commit | 87f9516e78985eeb4c9d24716f13d4f9585af302 (patch) | |
| tree | 2338dd74405abb866bd7877d29bd3f83a0af2b20 /app/assets/javascripts/merge_conflicts | |
| parent | 3d414ac4da07ccd9199fe53728ca5f3884dc2bc1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index 0d0e9a295fa..8c96f8a017e 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import initIssuableSidebar from '~/issuable/init_issuable_sidebar'; +import { initIssuableSidebar } from '~/issuable'; import MergeConflictsResolverApp from './merge_conflict_resolver_app.vue'; import { createStore } from './store'; |