From 2c8bd231ad7039d4234dc7334e39ee3ef22fd7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Mon, 9 Dec 2019 23:19:42 +0100 Subject: [PATCH] Fix merge --- content/_index.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/content/_index.md b/content/_index.md index 22e671d..161eada 100644 --- a/content/_index.md +++ b/content/_index.md @@ -106,11 +106,8 @@ Le format à respecter est : `[Prénom Nom](https://web-ou-reseau-social), fonct * Thierry Banel * [Quentin Barloy](https://twitter.com/nitneuq_y), [Les-Tilleuls.coop](https://les-tilleuls.coop) * [Timothée Barray](https://twitter.com/timbarray) -<<<<<<< HEAD -======= * [Benjamin Bayart](https://edgard.fdn.fr/cv.html) * [Guillaume Bec](https://twitter.com/Bes_fr) ->>>>>>> Update _index.md * Nina Belaid, Chercheuse en biochimie * Jeremy Barthe, Tech Lead à Mediapart * [Jérôme Béhuet](https://jbehuet.fr), Développeur - Freelance - DEEXIT