Fix conflict issue

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix conflict issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
52d10d73 · Dmitriy Zaporozhets · Valery Sizov · 2258572b · 52d10d73
Commit 52d10d73 authored Aug 11, 2015 by Dmitriy Zaporozhets Committed by Valery Sizov Aug 12, 2015
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

app/models/repository.rb app/models/repository.rb +0 -2

No files found.
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -403,8 +403,6 @@ class Repository
    Gitlab::Git::Blob.remove(raw_repository, options)
  end

-  private
-
  def user_to_comitter(user)
    {
      email: user.email,