Commit a94492b2 authored by Winnie Hellmann's avatar Winnie Hellmann

Resolve conflict in epic_show_app.vue

parent edbfe20d
Pipeline #14037815 failed with stages
in 150 minutes and 25 seconds
<script>
import issuableApp from '~/issue_show/components/app.vue';
<<<<<<< HEAD
import relatedIssuesRoot from '~/issuable/related_issues/components/related_issues_root.vue';
=======
import issuableAppEventHub from '~/issue_show/event_hub';
>>>>>>> 1d501f1d0e... Merge branch 'delete-epic' into 'master'
import epicHeader from './epic_header.vue';
import epicSidebar from '../../sidebar/components/sidebar_app.vue';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment