Fix conflict

2019-02-13 06:55:08 +00:00 · 2019-02-13 06:55:08 +00:00 · 8c3b9db2f3
parent 12af2a2ac5
commit 8c3b9db2f3
1 changed files with 0 additions and 5 deletions
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@ -8,13 +8,8 @@ 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.