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

app/views/projects/pages/_destroy.haml

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