Fix merge error

c5146ca1 · Jan-Gerd Tenberge · 355a7458 · c5146ca1
Commit c5146ca1 authored Oct 23, 2015 by Jan-Gerd Tenberge
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/helpers/application_helper.rb app/helpers/application_helper.rb +1 -1

No files found.
--- 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