diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2019-02-05 15:41:10 +0100 |
|---|---|---|
| committer | Francisco Javier López <fjlopez@gitlab.com> | 2019-02-05 15:41:10 +0100 |
| commit | bf0895893d1394af6869f62bf27fb2541553948b (patch) | |
| tree | d641a1da8491dc8ad48aa64cec865f7b52d8e368 | |
| parent | d18cd4ad0824288d0c3eb622f4270f0a4f521715 (diff) | |
| download | gitlab-ce-bf0895893d1394af6869f62bf27fb2541553948b.tar.gz | |
Resolve conflict in app/views/layouts/nav/sidebar/_project.html.haml
| -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 |