Commit e16fec65 authored by Filipa Lacerda's avatar Filipa Lacerda

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

parent ec0617d8
......@@ -5,12 +5,9 @@ import {
STATUS_FAILED,
STATUS_NEUTRAL,
} from '~/reports/constants';
<<<<<<< HEAD
import { componentNames } from 'ee/vue_shared/components/reports/issue_body';
import SastContainerInfo from 'ee/vue_shared/security_reports/components/sast_container_info.vue';
=======
>>>>>>> upstream/master
/**
* 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