flow/datamad2017
1
0
Fork 0
mirror of https://github.com/medialab-prado/datamad2017.git synced 2024-12-27 05:01:23 +01:00
Code Issues Projects Releases Wiki Activity

limpieza de conflicto

Browse source
This commit is contained in:
alay 2017-10-08 12:27:37 +02:00
parent bdb941f7d2
commit 7eec6db91b
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
_config.yml
View file

@ -46,15 +46,12 @@ navigationLinks:
- {permalink: "/proyectos/", text: "Proyectos"} - {permalink: "/proyectos/", text: "Proyectos"}
- {permalink: "/ponentes/", text: "Ponentes"} - {permalink: "/ponentes/", text: "Ponentes"}
- {permalink: "/blog/", text: "Blog"} - {permalink: "/blog/", text: "Blog"}
<<<<<<< HEAD
- {permalink: "/schedule/", text: "Programa"} - {permalink: "/schedule/", text: "Programa"}
- {permalink: "/speakers/", text: "Ponentes"} - {permalink: "/speakers/", text: "Ponentes"}
- {permalink: "/team/", text: "Equipo"} - {permalink: "/team/", text: "Equipo"}
- {permalink: "/logistics/", text: "Logística"} - {permalink: "/logistics/", text: "Logística"}
- {permalink: "/hackathon/", text: "DataMad"} - {permalink: "/hackathon/", text: "DataMad"}
=======
- {permalink: "/equipo/", text: "Equipo"} - {permalink: "/equipo/", text: "Equipo"}
>>>>>>> 4e94d685f2db90787677790cd8f797c34603da69
bottomNavigationLinks: bottomNavigationLinks:
- {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"} - {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
rightNavigationButtons: rightNavigationButtons:
@ -62,11 +59,9 @@ rightNavigationButtons:
# Home Block # Home Block
homeImage: "medialab_exterior_architizer.jpg" homeImage: "medialab_exterior_architizer.jpg"
<<<<<<< HEAD
homeTitle: "Premios de Datos Abiertos de Madrid 2017" homeTitle: "Premios de Datos Abiertos de Madrid 2017"
eventDate: "Octubre - Diciembre, 2017" eventDate: "Octubre - Diciembre, 2017"
#typeoutFallback: "Season" #typeoutFallback: "Season"
=======
homeTitle: "Premios de Datos Abiertos de Madrid <typeout> 2017" homeTitle: "Premios de Datos Abiertos de Madrid <typeout> 2017"
eventDate: "September - November, 2014" eventDate: "September - November, 2014"
# Hero Block # Hero Block
@ -75,7 +70,6 @@ heroTitle: "DataMad <typeout> 2017"
eventDate: "Octubre - Noviembre, 2017" eventDate: "Octubre - Noviembre, 2017"
typeoutTextValues: '"", "Madrid", "Datos abiertos", "Periodismo de datos", "Datatón"' typeoutTextValues: '"", "Madrid", "Datos abiertos", "Periodismo de datos", "Datatón"'
typeoutFallback: "Datos abiertos" typeoutFallback: "Datos abiertos"
>>>>>>> 4e94d685f2db90787677790cd8f797c34603da69
heroButtons: heroButtons:
- {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"} - {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
- {permalink: "/#tickets", text: "Buy tickets"} - {permalink: "/#tickets", text: "Buy tickets"}
@ -157,17 +151,14 @@ ticketsOffers:
ticketsNumber: "" ticketsNumber: ""
buyButtonLink: "" buyButtonLink: ""
buyButtonText: "Buy Now" buyButtonText: "Buy Now"
<<<<<<< HEAD
ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"] ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"]
validFrom: "2014-08-25T10:00" validFrom: "2014-08-25T10:00"
validThrough: "2014-09-30T23:59" validThrough: "2014-09-30T23:59"
=======
ticketContentList: ["Datos Abiertos", "Software Libre"] ticketContentList: ["Datos Abiertos", "Software Libre"]
validFrom: "2017-08-25T10:00" validFrom: "2017-08-25T10:00"
validThrough: "2017-09-30T23:59" validThrough: "2017-09-30T23:59"
soldOut: true soldOut: true
soldOutText: "Plazo terminado" soldOutText: "Plazo terminado"
>>>>>>> 4e94d685f2db90787677790cd8f797c34603da69
- -
name: "Convocatoria de colaboradores" name: "Convocatoria de colaboradores"
price: "60" price: "60"