Resolve conflict in app/views/layouts/nav/sidebar/_project.html.haml

parent d18cd4ad
...@@ -284,11 +284,7 @@ ...@@ -284,11 +284,7 @@
- if project_nav_tab?(:wiki) - if project_nav_tab?(:wiki)
- wiki_url = project_wiki_path(@project, :home) - wiki_url = project_wiki_path(@project, :home)
= nav_link(controller: :wikis) do = nav_link(controller: :wikis) do
<<<<<<< HEAD
= link_to wiki_url, class: 'shortcuts-wiki qa-wiki-link' do = link_to wiki_url, class: 'shortcuts-wiki qa-wiki-link' do
=======
= link_to wiki_url, class: 'shortcuts-wiki' do
>>>>>>> dev/master
.nav-icon-container .nav-icon-container
= sprite_icon('book') = sprite_icon('book')
%span.nav-item-name %span.nav-item-name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment