Resolve conflict in spec/mailers/notify_spec.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/mailers/notify_spec.rb

@@ -249,7 +249,21 @@ describe Notify do
         it_behaves_like 'it should show Gmail Actions View Merge request link'
         it_behaves_like "an unsubscribeable thread"
 
-<<<<<<< HEAD
+        it 'is sent as the author' do
+          sender = subject.header[:from].addrs[0]
+          expect(sender.display_name).to eq(current_user.name)
+          expect(sender.address).to eq(gitlab_sender)
+        end
+
+        it 'has the correct subject and body' do
+          aggregate_failures do
+            is_expected.to have_referable_subject(merge_request, reply: true)
+            is_expected.to have_html_escaped_body_text(previous_assignee.name)
+            is_expected.to have_body_text(project_merge_request_path(project, merge_request))
+            is_expected.to have_html_escaped_body_text(assignee.name)
+          end
+        end
+
         describe "that are new with approver" do
           before do
             create(:approver, target: merge_request)
@@ -276,25 +290,6 @@ describe Notify do
             is_expected.to have_html_escaped_body_text merge_request.description
           end
         end
-
-        describe 'that are reassigned' do
-          subject { described_class.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id) }
-=======
-        it 'is sent as the author' do
-          sender = subject.header[:from].addrs[0]
-          expect(sender.display_name).to eq(current_user.name)
-          expect(sender.address).to eq(gitlab_sender)
-        end
->>>>>>> upstream/master
-
-        it 'has the correct subject and body' do
-          aggregate_failures do
-            is_expected.to have_referable_subject(merge_request, reply: true)
-            is_expected.to have_html_escaped_body_text(previous_assignee.name)
-            is_expected.to have_body_text(project_merge_request_path(project, merge_request))
-            is_expected.to have_html_escaped_body_text(assignee.name)
-          end
-        end
       end
 
       describe 'that have been relabeled' do
@@ -372,9 +367,7 @@ describe Notify do
           end
         end
       end
-    end
 
-<<<<<<< HEAD
       describe 'that are approved' do
         let(:last_approver) { create(:user) }
         subject { described_class.approved_merge_request_email(recipient.id, merge_request.id, last_approver.id) }
@@ -462,15 +455,11 @@ describe Notify do
           is_expected.to have_body_text /#{merge_request.assignee.name}/
         end
       end
+    end
 
-        describe 'that are merged' do
-          let(:merge_author) { create(:user) }
-          subject { described_class.merged_merge_request_email(recipient.id, merge_request.id, merge_author.id) }
-=======
     context 'for snippet notes' do
       let(:project_snippet) { create(:project_snippet, project: project) }
       let(:project_snippet_note) { create(:note_on_project_snippet, project: project, noteable: project_snippet) }
->>>>>>> upstream/master
 
       subject { described_class.note_snippet_email(project_snippet_note.author_id, project_snippet_note.id) }