Fix conflicts for mr_widget_author_spec.js

5f3604ca · Filipa Lacerda · cc26483a · 5f3604ca
Commit 5f3604ca authored May 22, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js ...scripts/vue_mr_widget/components/mr_widget_author_spec.js +0 -4

No files found.
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
@@ -2,11 +2,7 @@ import Vue from 'vue';
 import MrWidgetAuthor from '~/vue_merge_request_widget/components/mr_widget_author.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';

-<<<<<<< HEAD
-describe('MrRWidgetAuthor', () => {
-=======
 describe('MrWidgetAuthor', () => {
->>>>>>> upstream/master
  let vm;

  beforeEach(() => {