mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-12-27 10:14:17 +08:00
conflict fix
This commit is contained in:
parent
ad4724ba04
commit
3cf1c5365f
1 changed files with 1 additions and 1 deletions
|
@ -21,7 +21,7 @@
|
|||
data-full-name="<%= user.full_name %>"
|
||||
data-email="<%= user.email %>"
|
||||
data-popover-html="<%= popover_html %>"
|
||||
data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>"
|
||||
data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, user.avatar.attached?) %>"
|
||||
>
|
||||
<%= user.full_name %>
|
||||
</a>
|
Loading…
Reference in a new issue