Fix conflicts for spec/javascripts/jobs/components/job_app_spec.js

spec/javascripts/jobs/components/job_app_spec.js

@@ -182,7 +182,6 @@ describe('Job App ', () => {
       expect(vm.$el.querySelector('.js-job-stuck')).toBeNull();
     });
   });
-<<<<<<< HEAD
 
   // ee-only start
   describe('runners limit - ee', () => {
@@ -216,6 +215,4 @@ describe('Job App ', () => {
   });
 
   // ee-only end
-=======
->>>>>>> upstream/master
 });