Skip to content

G
gitlab-ce
Commit 157684c1 authored by Francisco Javier López's avatar Francisco Javier López
Browse files
Options

Update _blob_data.html.haml

parent a90d72a2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/views/search/results/_blob_data.html.haml
View file @ 157684c1
...@@ -3,12 +3,8 @@ ...@@ -3,12 +3,8 @@
.js-file-title.file-title .js-file-title.file-title
= link_to blob_link do = link_to blob_link do
%i.fa.fa-file %i.fa.fa-file
<<<<<<< HEAD
%strong %strong
= search_blob_title(project, file_name) = search_blob_title(project, file_name)
=======
= search_blob_title(project, file_name)
>>>>>>> upstream/master
- if blob.data - if blob.data
.file-content.code.term .file-content.code.term
= render 'shared/file_highlight', blob: blob, first_line_number: blob.startline = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline
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