From ba8932b2acbb0cf1d8ab26cdca618908a73b3782 Mon Sep 17 00:00:00 2001 From: Winnie Hellmann <winnie@gitlab.com> Date: Fri, 26 Oct 2018 17:43:19 +0000 Subject: [PATCH] Resolve conflict in ee_switch_mr_widget_service.js --- .../services/ee_switch_mr_widget_service.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js b/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js index 9f0935f798d..6b929c709aa 100644 --- a/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js +++ b/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js @@ -1,7 +1,3 @@ -<<<<<<< HEAD import MRWidgetService from 'ee/vue_merge_request_widget/services/mr_widget_service'; -======= -import MRWidgetService from './mr_widget_service'; ->>>>>>> upstream/master export default MRWidgetService; -- 2.30.9