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

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

@@ -13,29 +13,17 @@
         Groups
 
   - if dashboard_nav_link?(:activity)
-<<<<<<< HEAD
-    = nav_link(path: 'dashboard#activity', html_options: { class: "d-none d-lg-block" }) do
-=======
     = nav_link(path: 'dashboard#activity', html_options: { class: "d-none d-lg-block d-xl-block" }) do
->>>>>>> gitlab-ce/master
       = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
         Activity
 
   - if dashboard_nav_link?(:milestones)
-<<<<<<< HEAD
-    = nav_link(controller: 'dashboard/milestones', html_options: { class: "d-none d-lg-block" }) do
-=======
     = nav_link(controller: 'dashboard/milestones', html_options: { class: "d-none d-lg-block d-xl-block" }) do
->>>>>>> gitlab-ce/master
       = link_to dashboard_milestones_path, class: 'dashboard-shortcuts-milestones', title: 'Milestones' do
         Milestones
 
   - if dashboard_nav_link?(:snippets)
-<<<<<<< HEAD
-    = nav_link(controller: 'dashboard/snippets', html_options: { class: "d-none d-lg-block" }) do
-=======
     = nav_link(controller: 'dashboard/snippets', html_options: { class: "d-none d-lg-block d-xl-block" }) do
->>>>>>> gitlab-ce/master
       = link_to dashboard_snippets_path, class: 'dashboard-shortcuts-snippets', title: 'Snippets' do
         Snippets