Resolve spec/finders/issues_finder_spec.rb

spec/finders/issues_finder_spec.rb

@@ -72,7 +72,6 @@ describe IssuesFinder do
         end
       end
 
-<<<<<<< HEAD
       context 'filtering by assignee IDs' do
         set(:user3) { create(:user) }
         let(:params) { { assignee_ids: [user2.id, user3.id] } }
@@ -100,13 +99,14 @@ describe IssuesFinder do
 
         it 'returns issues assigned to those users' do
           expect(issues).to contain_exactly(issue3)
-=======
+        end
+      end
+
       context 'filtering by no assignee' do
         let(:params) { { assignee_id: 0 } }
 
         it 'returns issues not assign to any assignee' do
           expect(issues).to contain_exactly(issue4)
->>>>>>> upstream/master
         end
       end