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

app/assets/javascripts/vue_shared/components/reports/report_issues.vue

 <script>
 import IssueStatusIcon from '~/vue_shared/components/reports/issue_status_icon.vue';
-<<<<<<< HEAD
 import { components, componentNames } from 'ee/vue_shared/components/reports/issue_body';
-=======
-import { components, componentNames } from '~/vue_shared/components/reports/issue_body';
->>>>>>> upstream/master
 
 export default {
   name: 'ReportIssues',

locale/gitlab.pot

@@ -7243,7 +7243,6 @@ msgstr ""
 msgid "branch name"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "by"
 msgstr ""
 
@@ -7454,8 +7453,6 @@ msgstr ""
 msgid "ciReport|on pipeline"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "command line instructions"
 msgstr ""