Commit 90a8fa72 authored by Filipa Lacerda's avatar Filipa Lacerda

Fix conflicts for app/assets/javascripts/reports/components/report_issues.vue

parent 15319208
<script>
<<<<<<< HEAD:app/assets/javascripts/reports/components/report_issues.vue
import IssueStatusIcon from '~/reports/components/issue_status_icon.vue';
import { components, componentNames } from 'ee/vue_shared/components/reports/issue_body';
=======
import IssueStatusIcon from './issue_status_icon.vue';
import { components, componentNames } from './issue_body';
>>>>>>> upstream/master:app/assets/javascripts/reports/components/report_issues.vue
export default {
name: 'ReportIssues',
......
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