Fix conflict in app/views/groups/_group_admin_settings.html.haml

d5b1061f · Clement Ho · b6c2a296 · d5b1061f
Commit d5b1061f authored May 25, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/groups/_group_admin_settings.html.haml app/views/groups/_group_admin_settings.html.haml +0 -3

No files found.
--- a/app/views/groups/_group_admin_settings.html.haml
+++ b/app/views/groups/_group_admin_settings.html.haml
@@ -10,11 +10,8 @@
        %br/
        %span.descr This setting can be overridden in each project.

-<<<<<<< HEAD
 = render partial: 'groups/ee/project_creation_level', locals: { form: f, group: @group }

-=======
->>>>>>> gitlab-ce/master
 .form-group.row
  = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2'
  .col-sm-10