Fix conflict issue

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

Fix conflict issue
52d10d73 · Dmitriy Zaporozhets · Valery Sizov · 2258572b · 52d10d73
Commit 52d10d73 authored 9 years ago by Dmitriy Zaporozhets Committed by Valery Sizov 9 years ago
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -403,8 +403,6 @@ def remove_file(user, path, message, ref)
    Gitlab::Git::Blob.remove(raw_repository, options)
  end
  
-  private
-
  def user_to_comitter(user)
    {
      email: user.email,