Fix merge error

2015-10-23 03:00:08 +02:00 · 2015-10-23 03:00:08 +02:00 · c5146ca151
parent 355a745842
commit c5146ca151
1 changed files with 1 additions and 1 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -68,7 +68,7 @@ module ApplicationHelper
    end
  end

-  def avatar_icon(user_email = nil, size = nil, scale = 2)
+  def avatar_icon(user_or_email = nil, size = nil, scale = 2)
    if user_or_email.is_a?(User)
      user = user_or_email
    else