Resolve conflicts in merge_requests/show.html.haml_spec.rb

aa583731 · Bob Van Landuyt · 4a5df964 · aa583731
Commit aa583731 authored Oct 10, 2017 by Bob Van Landuyt
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/views/projects/merge_requests/show.html.haml_spec.rb spec/views/projects/merge_requests/show.html.haml_spec.rb +0 -3

No files found.
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -54,11 +54,8 @@ describe 'projects/merge_requests/show.html.haml' do
    it 'closes the merge request if the source project does not exist' do
      closed_merge_request.update_attributes(state: 'open')
      forked_project.destroy
-<<<<<<< HEAD
      # Reload merge request so MergeRequest#source_project turns to `nil`
      closed_merge_request.reload
-=======
->>>>>>> ce-com/master

      render