diff options
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index bfc9f512a12..dd7833647b7 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -284,11 +284,7 @@ - if project_nav_tab?(:wiki) - wiki_url = project_wiki_path(@project, :home) = nav_link(controller: :wikis) do -<<<<<<< HEAD = link_to wiki_url, class: 'shortcuts-wiki qa-wiki-link' do -======= - = link_to wiki_url, class: 'shortcuts-wiki' do ->>>>>>> dev/master .nav-icon-container = sprite_icon('book') %span.nav-item-name |