Commit 83d752a4 authored by Clement Ho's avatar Clement Ho

Fix conflict in app/views/projects/pages/_destroy.haml

parent a5aabf4e
- if @project.pages_deployed? - if @project.pages_deployed?
- if can?(current_user, :remove_pages, @project) - if can?(current_user, :remove_pages, @project)
<<<<<<< HEAD
.card.card.bg-danger
=======
.card.bg-danger .card.bg-danger
>>>>>>> gitlab-ce/master
.card-header Remove pages .card-header Remove pages
.errors-holder .errors-holder
.card-body .card-body
......
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