opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix conflict

Browse source
This commit is contained in:
Oliver Davies 2019-02-13 06:55:08 +00:00
parent 12af2a2ac5
commit 8c3b9db2f3
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/talks.html.twig
View file

@ -8,13 +8,8 @@ talks:
- title: 'Drupal and the LDAP module' - 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. excerpt: A review and demonstration of some of the recent single sign-on work that I did using Drupal’s LDAP module.
events: events:
<<<<<<< HEAD
- event: swdug - event: swdug
date: 2013-07-10 date: 2013-07-10
=======
- event: swdug
date: '2013-07-10'
>>>>>>> Spaces
- title: 'About the Drupal Association' - 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. excerpt: An impromptu talk about what the Drupal Association is, and what work I’ve been doing since I joined the Association staff.