Commit 15319208 authored by Filipa Lacerda's avatar Filipa Lacerda

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

parent 2bc20a6e
<script> <script>
<<<<<<< HEAD:app/assets/javascripts/reports/components/issues_list.vue
import IssuesBlock from '~/reports/components/report_issues.vue'; import IssuesBlock from '~/reports/components/report_issues.vue';
=======
import IssuesBlock from './report_issues.vue';
>>>>>>> upstream/master:app/assets/javascripts/reports/components/issues_list.vue
import { import {
STATUS_SUCCESS, STATUS_SUCCESS,
STATUS_FAILED, STATUS_FAILED,
STATUS_NEUTRAL, STATUS_NEUTRAL,
<<<<<<< HEAD:app/assets/javascripts/reports/components/issues_list.vue
} from '~/reports/constants'; } from '~/reports/constants';
import { componentNames } from 'ee/vue_shared/components/reports/issue_body'; import { componentNames } from 'ee/vue_shared/components/reports/issue_body';
import SastContainerInfo from 'ee/vue_shared/security_reports/components/sast_container_info.vue'; import SastContainerInfo from 'ee/vue_shared/security_reports/components/sast_container_info.vue';
=======
} from '../constants';
>>>>>>> upstream/master:app/assets/javascripts/reports/components/issues_list.vue
/** /**
* Renders block of issues * Renders block of issues
......
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