Resolve conflict in spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

@@ -52,7 +52,6 @@ describe('MergeRequestStore', () => {
         expect(store.isPipelineSkipped).toBe(false);
       });
     });
-<<<<<<< HEAD
   });
 
   describe('setCodeclimateHeadMetrics', () => {
@@ -94,7 +93,5 @@ describe('MergeRequestStore', () => {
     it('should return the resolved issues', () => {
       expect(store.codeclimateMetrics.resolvedIssues[0]).toEqual(baseIssues[1]);
     });
-=======
->>>>>>> upstream/master
   });
 });