Fix conflicts in blob/_blob.html.haml

91baf032 · Bob Van Landuyt · c4045b32 · 91baf032
Commit 91baf032 authored Sep 06, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/projects/blob/_blob.html.haml app/views/projects/blob/_blob.html.haml +0 -3

No files found.
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
@@ -4,10 +4,7 @@
  .well-segment
    %ul.blob-commit-info
      = render 'projects/commits/commit', commit: @last_commit, project: @project, ref: @ref
-<<<<<<< HEAD
-=======

->>>>>>> upstream/master
  = render_if_exists 'projects/blob/owners', blob: blob
  = render "projects/blob/auxiliary_viewer", blob: blob