Commit 6e0b2189 authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett

Resolve milestone_spec.rb conflicts

parent 121bfbb9
...@@ -110,13 +110,8 @@ feature 'Project milestone', :feature do ...@@ -110,13 +110,8 @@ feature 'Project milestone', :feature do
find('.milestone-sidebar .block', match: :first) find('.milestone-sidebar .block', match: :first)
aggregate_failures 'MR and issue blocks' do aggregate_failures 'MR and issue blocks' do
<<<<<<< HEAD
expect(blocks[3]).to have_content 1
expect(blocks[5]).to have_content 0
=======
expect(find('.milestone-sidebar .block.issues')).to have_content 1 expect(find('.milestone-sidebar .block.issues')).to have_content 1
expect(find('.milestone-sidebar .block.merge-requests')).to have_content 0 expect(find('.milestone-sidebar .block.merge-requests')).to have_content 0
>>>>>>> ce-com/master
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment