Fix conflict app/models/blob.rb

e5184037 · Filipa Lacerda · 436c1881 · e5184037
Commit e5184037 authored Oct 31, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/blob.rb app/models/blob.rb +0 -3

No files found.
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -2,10 +2,7 @@
 # Blob is a Rails-specific wrapper around Gitlab::Git::Blob, SnippetBlob and Ci::ArtifactBlob
 class Blob < SimpleDelegator
-<<<<<<< HEAD
  prepend EE::Blob
-=======
->>>>>>> upstream/master
  include Presentable
  include BlobLanguageFromGitAttributes