Commit f7d7ff3a authored by Lukas Eipert's avatar Lukas Eipert

resolve conflict in `app/assets/javascripts/vue_shared/components/reports/issues_list.vue`

parent c02356b4
......@@ -5,12 +5,9 @@ import {
STATUS_FAILED,
STATUS_NEUTRAL,
} from '~/vue_shared/components/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
......@@ -21,10 +18,7 @@ export default {
IssuesBlock,
SastContainerInfo,
},
<<<<<<< HEAD
componentNames,
=======
>>>>>>> upstream/master
success: STATUS_SUCCESS,
failed: STATUS_FAILED,
neutral: STATUS_NEUTRAL,
......
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