diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-07 18:15:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-07 18:15:03 +0300 |
| commit | 3a0f6ebaa9a80e34c09f599a624f6e4520009ef1 (patch) | |
| tree | 4560fa6bcba7d950595e906ee3286dd1e44642f1 /app/assets/javascripts/merge_conflicts | |
| parent | 6dd9e3644eea1a5c605a6a623cae1d53b156b9e5 (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 cf02c6fbd6b..0d0e9a295fa 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 '../init_issuable_sidebar'; +import initIssuableSidebar from '~/issuable/init_issuable_sidebar'; import MergeConflictsResolverApp from './merge_conflict_resolver_app.vue'; import { createStore } from './store'; |