Resolve conflict in spec/lib/gitlab/incoming_email_spec.rb

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

spec/lib/gitlab/incoming_email_spec.rb

@@ -87,7 +87,6 @@ describe Gitlab::IncomingEmail do
     it 'does not match emails with extra bits' do
       expect(described_class.key_from_address('somereplies+somekey@example.com.someotherdomain.com')).to be nil
     end
-<<<<<<< HEAD
 
     context "on GitLab.com" do
       before do
@@ -107,8 +106,6 @@ describe Gitlab::IncomingEmail do
         expect(described_class.key_from_address("incoming+key@incoming.gitlab.com.someotherdomain.com")).to be_nil
       end
     end
-=======
->>>>>>> upstream/master
   end
 
   context 'self.key_from_fallback_message_id' do