Fix conflict in app/views/admin/identities/_form.html.haml

app/views/admin/identities/_form.html.haml

@@ -2,20 +2,12 @@
   = form_errors(@identity)
 
   .form-group.row
-<<<<<<< HEAD
-    = f.label :provider, class: 'col-form-label'
-=======
     = f.label :provider, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
     .col-sm-10
       - values = Gitlab::Auth::OAuth::Provider.providers.map { |name| ["#{Gitlab::Auth::OAuth::Provider.label_for(name)} (#{name})", name] }
       = f.select :provider, values, { allow_blank: false }, class: 'form-control'
   .form-group.row
-<<<<<<< HEAD
-    = f.label :extern_uid, "Identifier", class: 'col-form-label'
-=======
     = f.label :extern_uid, "Identifier", class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
     .col-sm-10
       = f.text_field :extern_uid, class: 'form-control', required: true