From ce719fdcdec8780cf66ee81202e392bba09cdf63 Mon Sep 17 00:00:00 2001
From: ATCHAMADO_BEN <benatcha03@gmail.com>
Date: Tue, 19 Mar 2024 15:53:20 +0100
Subject: [PATCH] =?UTF-8?q?Tue=20Mar=2019=202024=2015:53:19=20GMT+0100=20(?=
 =?UTF-8?q?heure=20normale=20d=E2=80=99Europe=20centrale)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 01/title.txt  | 6 +-----
 manifest.json | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/01/title.txt b/01/title.txt
index dcb8efc..1966e00 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Eta 1
-=======
-Eta 5
->>>>>>> e3d05e217396c5e8ef84915779c96f906bcd3327
+Eta 1
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index e06eab8..05590cc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -27,14 +27,15 @@
 			"language_id": "fr",
 			"resource_id": "f10",
 			"checking_level": "3",
-			"date_modified": "2017-10-13T00:00:00+00:00",
+			"date_modified": "2023-05-11T16:03:41.0315176+00:00",
 			"version": "1910"
 		}
 	],
 	"parent_draft": {},
 	"translators": [
 		"nina",
-		"Lari"
+		"Lari",
+		"ATCHAMADO_BEN"
 	],
 	"finished_chunks": [
 		"front-title",