Fix whitespace conflict in mr_widget_options_spec.js

spec/javascripts/vue_mr_widget/mr_widget_options_spec.js

@@ -79,10 +79,6 @@ describe('mrWidgetOptions', () => {
 
       it('should return true if there is relatedLinks in MR', () => {
         Vue.set(vm.mr, 'relatedLinks', {});
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
         expect(vm.shouldRenderRelatedLinks).toBeTruthy();
       });
     });