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

bf089589 · Francisco Javier López · d18cd4ad · bf089589
Commit bf089589 authored Feb 05, 2019 by Francisco Javier López
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/layouts/nav/sidebar/_project.html.haml app/views/layouts/nav/sidebar/_project.html.haml +0 -4

No files found.
--- 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