fix conflicts in spec/features/merge_requests/edit_mr_spec.rb

d433368c · Mike Greiling · 43d07658 · d433368c
Commit d433368c authored Jul 10, 2017 by Mike Greiling
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/features/merge_requests/edit_mr_spec.rb spec/features/merge_requests/edit_mr_spec.rb +0 -4

No files found.
--- a/spec/features/merge_requests/edit_mr_spec.rb
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -9,11 +9,7 @@ feature 'Edit Merge Request', feature: true do
    before do
      project.team << [user, :master]
-<<<<<<< HEAD
      sign_in user
-=======
-    sign_in user
->>>>>>> 9-4-stable
      visit_edit_mr_page
    end