Commit 837c502f authored by Clement Ho's avatar Clement Ho

Fix conflict in app/views/shared/milestones/_issuables.html.haml

parent 99c9fd31
- show_counter = local_assigns.fetch(:show_counter, false)
- primary = local_assigns.fetch(:primary, false)
<<<<<<< HEAD
- panel_class = primary ? 'bg-primary' : ''
=======
- panel_class = primary ? 'bg-primary text-white' : ''
>>>>>>> gitlab-ce/master
.card{ class: panel_class }
.card-header
......
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