Resolve conflicts in spec/models/issue_spec.rb

spec/models/issue_spec.rb

@@ -268,7 +268,6 @@ describe Issue do
     end
   end
 
-<<<<<<< HEAD
   describe '#related_issues' do
     let(:user) { create(:user) }
     let(:authorized_project) { create(:project) }
@@ -306,8 +305,6 @@ describe Issue do
     end
   end
 
-=======
->>>>>>> upstream/master
   describe '#suggested_branch_name' do
     let(:repository) { double }