Resolve conflicts for spec/javascripts/vue_shared/components/reports/report_section_spec.js

spec/javascripts/vue_shared/components/reports/report_section_spec.js

@@ -86,10 +86,6 @@ describe('Report section', () => {
       });
     });
   });
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
   describe('when it is loading', () => {
     it('should render loading indicator', () => {
       vm = mountComponent(ReportSection, {
@@ -175,7 +171,6 @@ describe('Report section', () => {
       expect(vm.$el.textContent.trim()).toEqual('Failed to load codeclimate report');
     });
   });
-<<<<<<< HEAD
 
   describe('With full report', () => {
     beforeEach(() => {
@@ -259,6 +254,4 @@ describe('Report section', () => {
       });
     });
   });
-=======
->>>>>>> upstream/master
 });