summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/blob.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb
index a8b8f4937cc..5ae35d3ab08 100644
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -43,7 +43,6 @@ class Blob < SimpleDelegator
BlobViewer::License,
BlobViewer::Contributing,
BlobViewer::Changelog
->>>>>>> app/models/blob.rb
].freeze
attr_reader :project