Skip to content

G
gitlab-ce
Commit bd87c91c authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files
Options

Resolve app/views/projects/tree/_tree_header.html.haml

parent 4e8a6a90
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/views/projects/tree/_tree_header.html.haml
View file @ bd87c91c
...@@ -73,10 +73,7 @@ ...@@ -73,10 +73,7 @@
= link_to ide_edit_path(@project, @id), class: 'btn btn-default' do = link_to ide_edit_path(@project, @id), class: 'btn btn-default' do
= ide_edit_text = ide_edit_text
<<<<<<< HEAD
= lock_file_link(html_options: { class: 'btn path-lock' }) = lock_file_link(html_options: { class: 'btn path-lock' })
=======
>>>>>>> upstream/master
= link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn' = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'
= render 'projects/find_file_link' = render 'projects/find_file_link'
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7