Patching unmerged path

2026-01-24 20:36:49 +00:00 · 2014-05-06 18:31:20 +10:00
parent 549b41d6fe
commit 6af314a075
1 changed files with 0 additions and 6 deletions
--- 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