Fixes conflicts for app/assets/javascripts/jobs/components/job_app.vue

app/assets/javascripts/jobs/components/job_app.vue

@@ -5,12 +5,9 @@
   import bp from '~/breakpoints';
   import CiHeader from '~/vue_shared/components/header_ci_component.vue';
   import Callout from '~/vue_shared/components/callout.vue';
-<<<<<<< HEAD
   // ee-only start
   import SharedRunner from 'ee/jobs/components/shared_runner_limit_block.vue';
   // ee-only end
-=======
->>>>>>> upstream/master
   import createStore from '../store';
   import EmptyState from './empty_state.vue';
   import EnvironmentsBlock from './environments_block.vue';
@@ -32,10 +29,7 @@
       Log,
       LogTopBar,
       StuckBlock,
-<<<<<<< HEAD
       SharedRunner,
-=======
->>>>>>> upstream/master
       Sidebar,
     },
     props: {
@@ -88,10 +82,7 @@
         'shouldRenderTriggeredLabel',
         'hasEnvironment',
         'isJobStuck',
-<<<<<<< HEAD
         'shouldRenderSharedRunnerLimitWarning',
-=======
->>>>>>> upstream/master
         'hasTrace',
         'emptyStateIllustration',
         'isScrollingDown',