diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-17 10:19:43 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-17 10:19:43 -0500 |
| commit | 7dbeef74fe655a6666cbe9550ff1bf7607e056a5 (patch) | |
| tree | ebc918f00bd56c9d4ab95eb0f6d3905a618a0934 | |
| parent | 1d96dfc1ac99a8bff76e862bd8e475c716ac1df4 (diff) | |
| download | gitlab-ce-dm-changelog-viewer.tar.gz | |
Remove stray conflict markerdm-changelog-viewer
| -rw-r--r-- | app/models/blob.rb | 1 |
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 |