Fixed merge conflict

2015-08-13 21:45:17 +01:00 · 2015-08-13 21:45:17 +01:00 · d51d2bf45d
parent 45c95923be
commit d51d2bf45d
1 changed files with 1 additions and 0 deletions
--- a/source/_partials/talk_listing_item.html.twig
+++ b/source/_partials/talk_listing_item.html.twig
@ -1,5 +1,6 @@
 <li>{% spaceless %}
    <strong>
+        {% if not talk.fuzzy_date %}
            {{ talk.date|date('jS F') }}
        {% else %}
            {{ talk.date|date('F') }}