Skip to content

G
gitlab-ce
Commit d5b1061f authored by Clement Ho's avatar Clement Ho
Browse files
Options

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

parent b6c2a296
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/views/groups/_group_admin_settings.html.haml
View file @ d5b1061f
...@@ -10,11 +10,8 @@ ...@@ -10,11 +10,8 @@
%br/ %br/
%span.descr This setting can be overridden in each project. %span.descr This setting can be overridden in each project.
<<<<<<< HEAD
= render partial: 'groups/ee/project_creation_level', locals: { form: f, group: @group } = render partial: 'groups/ee/project_creation_level', locals: { form: f, group: @group }
=======
>>>>>>> gitlab-ce/master
.form-group.row .form-group.row
= f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2' = f.label :require_two_factor_authentication, 'Two-factor authentication', class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7