Skip to content

G
gitlab-ce
Commit f7d7ff3a authored by Lukas Eipert's avatar Lukas Eipert
Browse files
Options

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

parent c02356b4
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
app/assets/javascripts/vue_shared/components/reports/issues_list.vue
View file @ f7d7ff3a
...@@ -5,12 +5,9 @@ import { ...@@ -5,12 +5,9 @@ import {
STATUS_FAILED, STATUS_FAILED,
STATUS_NEUTRAL, STATUS_NEUTRAL,
} from '~/vue_shared/components/reports/constants'; } from '~/vue_shared/components/reports/constants';
<<<<<<< HEAD
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';
=======
>>>>>>> upstream/master
/** /**
* Renders block of issues * Renders block of issues
...@@ -21,10 +18,7 @@ export default { ...@@ -21,10 +18,7 @@ export default {
IssuesBlock, IssuesBlock,
SastContainerInfo, SastContainerInfo,
}, },
<<<<<<< HEAD
componentNames, componentNames,
=======
>>>>>>> upstream/master
success: STATUS_SUCCESS, success: STATUS_SUCCESS,
failed: STATUS_FAILED, failed: STATUS_FAILED,
neutral: STATUS_NEUTRAL, 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7