Resolve CE-to-EE conflicts for job page

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

@@ -81,10 +81,7 @@
         'shouldRenderCalloutMessage',
         'shouldRenderTriggeredLabel',
         'hasEnvironment',
-<<<<<<< HEAD
         'shouldRenderSharedRunnerLimitWarning',
-=======
->>>>>>> upstream/master
         'hasTrace',
         'emptyStateIllustration',
         'isScrollingDown',

app/assets/javascripts/jobs/store/getters.js

@@ -41,7 +41,6 @@ export const emptyStateIllustration = state =>
   (state.job && state.job.status && state.job.status.illustration) || {};
 
 export const emptyStateAction = state =>  (state.job && state.job.status && state.job.status.action) || {};
-<<<<<<< HEAD
 
 // ee-only start
 /**
@@ -55,8 +54,6 @@ export const shouldRenderSharedRunnerLimitWarning = state =>
   !_.isEmpty(state.job.runners.quota) &&
   state.job.runners.quota.used >= state.job.runners.quota.limit;
 // ee-only end
-=======
->>>>>>> upstream/master
 
 export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete;
 

spec/javascripts/jobs/store/getters_spec.js

@@ -175,7 +175,6 @@ describe('Job Store Getters', () => {
     });
   });
 
-<<<<<<< HEAD
   describe('shouldRenderSharedRunnerLimitWarning', () => {
     describe('without runners information', () => {
       it('returns false', () => {
@@ -231,8 +230,6 @@ describe('Job Store Getters', () => {
     });
   });
 
-=======
->>>>>>> upstream/master
   describe('hasRunnersForProject', () => {
     describe('with available and offline runners', () => {
       it('returns true', () => {