Fixed merge conflict
This commit is contained in:
parent
45c95923be
commit
d51d2bf45d
|
@ -1,5 +1,6 @@
|
||||||
<li>{% spaceless %}
|
<li>{% spaceless %}
|
||||||
<strong>
|
<strong>
|
||||||
|
{% if not talk.fuzzy_date %}
|
||||||
{{ talk.date|date('jS F') }}
|
{{ talk.date|date('jS F') }}
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ talk.date|date('F') }}
|
{{ talk.date|date('F') }}
|
||||||
|
|
Loading…
Reference in a new issue