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

Fixed talks page

Browse source
This commit is contained in:
Oliver Davies 2015-04-25 14:44:39 +01:00
parent 5ca4ca775c
commit a0fead16ea
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/talks.html.twig
View file

@ -2,20 +2,6 @@
layout: default layout: default
title: Talks title: Talks
nav: talks nav: talks
<<<<<<< HEAD
use:
- talks
---
<h1>Talks</h1>
<dl>
{% for talk in data.talks %}
<dt>{{ talk.date|date('F Y') }} - {{ talk.location|raw }}</dt>
<dd><a href="{{ site.url }}{{ talk.url }}">{{ talk.title }}</a></dd>
{% endfor %}
</dl>
=======
meta: meta:
description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups' description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups'
talks: talks:
@ -112,4 +98,3 @@ talks:
{% if found %} {% if found %}
</dl> </dl>
{% endif %} {% endif %}
>>>>>>> master