Fix conflict in app/views/projects/pages_domains/_form.html.haml

app/views/projects/pages_domains/_form.html.haml

@@ -5,33 +5,21 @@
         %p= msg
 
 .form-group.row
-<<<<<<< HEAD
-  = f.label :domain, class: 'col-form-label' do
-=======
   = f.label :domain, class: 'col-form-label col-sm-2' do
->>>>>>> gitlab-ce/master
     Domain
   .col-sm-10
     = f.text_field :domain, required: true, autocomplete: 'off', class: 'form-control', disabled: @domain.persisted?
 
 - if Gitlab.config.pages.external_https
   .form-group.row
-<<<<<<< HEAD
-    = f.label :certificate, class: 'col-form-label' do
-=======
     = f.label :certificate, class: 'col-form-label col-sm-2' do
->>>>>>> gitlab-ce/master
       Certificate (PEM)
     .col-sm-10
       = f.text_area :certificate, rows: 5, class: 'form-control'
       %span.help-inline Upload a certificate for your domain with all intermediates
 
   .form-group.row
-<<<<<<< HEAD
-    = f.label :key, class: 'col-form-label' do
-=======
     = f.label :key, class: 'col-form-label col-sm-2' do
->>>>>>> gitlab-ce/master
       Key (PEM)
     .col-sm-10
       = f.text_area :key, rows: 5, class: 'form-control'