From d51d2bf45d9f0b23a29007be2a423dda7a0004ad Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 13 Aug 2015 21:45:17 +0100
Subject: [PATCH] Fixed merge conflict

---
 source/_partials/talk_listing_item.html.twig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/_partials/talk_listing_item.html.twig b/source/_partials/talk_listing_item.html.twig
index 5c9c6c66..18cddc4d 100644
--- 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') }}