Skip to content

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

Fix conflict in app/views/admin/groups/show.html.haml

parent b4f738c0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/views/admin/groups/show.html.haml
View file @ 44d8c684
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
= group_lfs_status(@group) = group_lfs_status(@group)
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
<<<<<<< HEAD
= render partial: "namespaces/shared_runner_status", locals: { namespace: @group } = render partial: "namespaces/shared_runner_status", locals: { namespace: @group }
- if Gitlab::Auth::LDAP::Config.group_sync_enabled? && @group.ldap_synced? - if Gitlab::Auth::LDAP::Config.group_sync_enabled? && @group.ldap_synced?
...@@ -73,8 +72,6 @@ ...@@ -73,8 +72,6 @@
as as
%strong= ldap_group_link.human_access %strong= ldap_group_link.human_access
=======
>>>>>>> gitlab-ce/master
.card .card
.card-header .card-header
%h3.card-title %h3.card-title
......
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