Skip to content

Commit

Permalink
resolve conflict with main
Browse files Browse the repository at this point in the history
  • Loading branch information
WilliamDiakite committed Oct 15, 2024
1 parent 232c80c commit e137a29
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion evenements/2024-08-07-fr.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "L’Ouvroir à DH2024"
subtitle: "Première présentation publiqeu de l’ontologie Display"
subtitle: "Première présentation publique de l’ontologie Display"
dateStart: 2024-08-07
dateEnd: 2024-08-07
timeStart: 04:00pm
Expand Down
1 change: 1 addition & 0 deletions evenements/2024-10-15-en.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ link: https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=M21xc2UyN
description: Welcome to our lab space and demonstrations of the research projects conducted here.
participants:
[Emmanuel Château-Dutier, Kristine Tanton, Zoë Renaudie, William Diakité]
lang: en
draft: false
---

Expand Down
1 change: 1 addition & 0 deletions evenements/2024-10-15-fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ link: https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=M21xc2UyN
description: Accueil dans l’espace du laboratoire et démonstration des projets de recherche qui y sont menés.
participants:
[Emmanuel Château-Dutier, Kristine Tanton, Zoë Renaudie, William Diakité]
lang: fr
draft: false
---

Expand Down

0 comments on commit e137a29

Please sign in to comment.