From 498bb7e98d8dfd95d97c565ced08f95283795b1d Mon Sep 17 00:00:00 2001 From: Clement Ho <ClemMakesApps@gmail.com> Date: Fri, 25 May 2018 17:28:18 -0500 Subject: [PATCH] Fix conflict in app/views/layouts/nav/sidebar/_admin.html.haml --- app/views/layouts/nav/sidebar/_admin.html.haml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 99feaa4caa1..87c09965835 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -135,7 +135,6 @@ %strong.fly-out-top-item-name #{ _('Abuse Reports') } %span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all)) -<<<<<<< HEAD = nav_link(controller: :licenses) do = link_to admin_license_path do @@ -148,8 +147,6 @@ = link_to admin_license_path do %strong.fly-out-top-item-name #{ _('License') } -======= ->>>>>>> gitlab-ce/master - if akismet_enabled? = nav_link(controller: :spam_logs) do -- 2.30.9