Fix conflict in app/views/layouts/nav/_group_settings.html.haml

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/layouts/nav/_group_settings.html.haml

 - if current_user
-<<<<<<< HEAD
-  - if access = @group.users.find_by(id: current_user.id)
-    .controls
-      .dropdown.group-settings-dropdown
-        %a.dropdown-new.btn.btn-default#group-settings-button{href: '#', 'data-toggle' => 'dropdown'}
-          = icon('cog')
-          = icon('caret-down')
-        %ul.dropdown-menu.dropdown-menu-align-right
-          - if can?(current_user, :admin_group, @group)
-            = nav_link(path: 'groups#projects') do
-              = link_to projects_group_path(@group), title: 'Projects' do
-                Projects
-            - if ldap_enabled?
-              = nav_link(controller: :ldap_group_links) do
-                = link_to group_ldap_group_links_path(@group), title: "LDAP Groups" do
-                  %span
-                    LDAP Groups
-            = nav_link(controller: :hooks) do
-              = link_to group_hooks_path(@group), title: "Webhooks" do
-                %span
-                  Webhooks
-            = nav_link(controller: :audit_events) do
-              = link_to group_audit_events_path(@group), title: "Audit Events" do
-                %span
-                  Audit Events
-            %li.divider
-            %li
-              = link_to edit_group_path(@group) do
-                Edit Group
-=======
   - can_edit = can?(current_user, :admin_group, @group)
   - member = @group.members.non_request.find_by(user_id: current_user.id)
   - can_leave = member && can?(current_user, :destroy_group_member, member)
@@ -43,6 +13,19 @@
           = link_to 'Projects', projects_group_path(@group), title: 'Projects'
         %li.divider
         - if can_edit
+          - if ldap_enabled?
+            = nav_link(controller: :ldap_group_links) do
+              = link_to group_ldap_group_links_path(@group), title: "LDAP Groups" do
+                %span
+                  LDAP Groups
+          = nav_link(controller: :hooks) do
+            = link_to group_hooks_path(@group), title: "Webhooks" do
+              %span
+                Webhooks
+          = nav_link(controller: :audit_events) do
+            = link_to group_audit_events_path(@group), title: "Audit Events" do
+              %span
+                Audit Events
           %li
             = link_to 'Edit Group', edit_group_path(@group)
         - if can_leave
@@ -50,4 +33,3 @@
             = link_to polymorphic_path([:leave, @group, :members]),
               data: { confirm: leave_confirmation_message(@group) }, method: :delete, title: 'Leave group' do
               Leave Group
->>>>>>> 0115ab7f403e7b25a7e66c3f4c309ddd5f37d657