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

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

@@ -5,29 +5,17 @@
     %fieldset
       %legend Account
       .form-group.row
-<<<<<<< HEAD
-        = f.label :name, class: 'col-form-label'
-=======
         = f.label :name, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
         .col-sm-10
           = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control'
           %span.help-inline * required
       .form-group.row
-<<<<<<< HEAD
-        = f.label :username, class: 'col-form-label'
-=======
         = f.label :username, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
         .col-sm-10
           = f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control'
           %span.help-inline * required
       .form-group.row
-<<<<<<< HEAD
-        = f.label :email, class: 'col-form-label'
-=======
         = f.label :email, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
         .col-sm-10
           = f.text_field :email, required: true, autocomplete: 'off', class: 'form-control'
           %span.help-inline * required
@@ -36,11 +24,7 @@
       %fieldset
         %legend Password
         .form-group.row
-<<<<<<< HEAD
-          = f.label :password, class: 'col-form-label'
-=======
           = f.label :password, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
           .col-sm-10
             %strong
               Reset link will be generated and sent to the user.
@@ -50,17 +34,10 @@
       %fieldset
         %legend Password
         .form-group.row
-<<<<<<< HEAD
-          = f.label :password, class: 'col-form-label'
-          .col-sm-10= f.password_field :password, disabled: f.object.force_random_password, class: 'form-control'
-        .form-group.row
-          = f.label :password_confirmation, class: 'col-form-label'
-=======
           = f.label :password, class: 'col-form-label col-sm-2'
           .col-sm-10= f.password_field :password, disabled: f.object.force_random_password, class: 'form-control'
         .form-group.row
           = f.label :password_confirmation, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
           .col-sm-10= f.password_field :password_confirmation, disabled: f.object.force_random_password, class: 'form-control'
 
     = render partial: 'access_levels', locals: { f: f }
@@ -76,36 +53,21 @@
     %fieldset
       %legend Profile
       .form-group.row
-<<<<<<< HEAD
-        = f.label :avatar, class: 'col-form-label'
-=======
         = f.label :avatar, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
         .col-sm-10
           = f.file_field :avatar
 
       .form-group.row
-<<<<<<< HEAD
-        = f.label :skype, class: 'col-form-label'
-        .col-sm-10= f.text_field :skype, class: 'form-control'
-      .form-group.row
-        = f.label :linkedin, class: 'col-form-label'
-=======
         = f.label :skype, class: 'col-form-label col-sm-2'
         .col-sm-10= f.text_field :skype, class: 'form-control'
       .form-group.row
         = f.label :linkedin, class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
         .col-sm-10= f.text_field :linkedin, class: 'form-control'
       .form-group.row
         = f.label :twitter, class: 'col-form-label'
         .col-sm-10= f.text_field :twitter, class: 'form-control'
       .form-group.row
-<<<<<<< HEAD
-        = f.label :website_url, 'Website', class: 'col-form-label'
-=======
         = f.label :website_url, 'Website', class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
         .col-sm-10= f.text_field :website_url, class: 'form-control'
 
     %fieldset