From 3403b605e28e69cb01a96db58304c778a74c0254 Mon Sep 17 00:00:00 2001
From: daf2cdcc66ec889877438e1cf5ee3ab8
 <elise.cheynet@INMG1012-Elise-Cheynet.local>
Date: Fri, 10 Nov 2023 18:44:49 +0100
Subject: [PATCH] date

---
 module2/exo1/toy_document_fr.Rmd | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/module2/exo1/toy_document_fr.Rmd b/module2/exo1/toy_document_fr.Rmd
index c7b074a..df09185 100644
--- a/module2/exo1/toy_document_fr.Rmd
+++ b/module2/exo1/toy_document_fr.Rmd
@@ -1,7 +1,9 @@
 ---
+<<<<<<< HEAD
 title: "mon titre ehe"
-author: "Votre nom"
-date: "La date du jour"
+title: "Votre titre"
+author: "ceci est un test"
+date: "La november"
 output: html_document
 ---
 
-- 
2.18.1