Fix conflict issue

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

Fix conflict issue
1891cab4 · Dmitriy Zaporozhets · 3b02ad84 · 1891cab4
Unverified Commit 1891cab4 authored Aug 11, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

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,