Spaces

2019-01-28 23:06:30 +00:00 · 2019-01-28 23:06:30 +00:00 · 561b356fbc
parent 17a1738d75
commit 561b356fbc
1 changed files with 5 additions and 0 deletions
--- 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.