fix merge
This commit is contained in:
parent
1aa522e138
commit
4e609da2b7
@ -113,7 +113,7 @@
|
||||
<img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bump$
|
||||
{% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
|
||||
{% if config.font_awesome %}
|
||||
<i class="icon-anchor icon"></i>
|
||||
{% else %}
|
||||
|
Loading…
Reference in New Issue
Block a user