Update _blob_data.html.haml

157684c1 · Francisco Javier López · a90d72a2 · 157684c1
Commit 157684c1 authored Jun 04, 2018 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/views/search/results/_blob_data.html.haml app/views/search/results/_blob_data.html.haml +0 -4

No files found.
--- a/app/views/search/results/_blob_data.html.haml
+++ b/app/views/search/results/_blob_data.html.haml
@@ -3,12 +3,8 @@
    .js-file-title.file-title
      = link_to blob_link do
        %i.fa.fa-file
-<<<<<<< HEAD
        %strong
          = search_blob_title(project, file_name)
-=======
-        = search_blob_title(project, file_name)
->>>>>>> upstream/master
    - if blob.data
      .file-content.code.term
        = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline