From 6af314a07580e5f1aef7e5a2ee67226ed2a7cbf4 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 6 May 2014 18:31:20 +1000
Subject: [PATCH] Patching unmerged path

---
 app/views/shared/menu/_large_menu.html.haml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index 35348dfbfd..75fb0e7121 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -1,13 +1,7 @@
 %nav.top-bar.hide-for-small{'data' => 'topbar'}
   %section.top-bar-section
     %ul.left
-<<<<<<< HEAD
-      -#%li
-        -#%a.icon{"ng-click" => "Sidebar.toggle()"}
-          -#%i.fi-list
       %li= link_to image_tag("ofn_logo_small.png"), root_path      
-=======
->>>>>>> Removing pointless foundation crud, reworking the login
       %li.divider
       %li
         %a