From 561b356fbcb04aaeae3934a21c27f7a2deabebe0 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 28 Jan 2019 23:06:30 +0000
Subject: [PATCH] Spaces

---
 source/talks.html.twig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/talks.html.twig b/source/talks.html.twig
index 32035aa53..bf496bdf9 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -8,8 +8,13 @@ talks:
   - title: 'Drupal and the LDAP module'
     excerpt: A review and demonstration of some of the recent single sign-on work that I did using Drupal’s LDAP module.
     events:
+<<<<<<< HEAD
       - event: swdug
         date: 2013-07-10
+=======
+        - event: swdug
+          date: '2013-07-10'
+>>>>>>> Spaces
 
   - title: 'About the Drupal Association'
     excerpt: An impromptu talk about what the Drupal Association is, and what work I’ve been doing since I joined the Association staff.