From 395e3bd347c78e089470c3d3832adbb58452dadf Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Fri, 24 Jan 2020 15:54:32 -0500
Subject: [PATCH] Fri Jan 24 2020 15:54:32 GMT-0500 (Eastern Standard Time)

---
 03/title.txt  | 6 +-----
 manifest.json | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/03/title.txt b/03/title.txt
index 13dbf6c..200aab7 100644
--- a/03/title.txt
+++ b/03/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Chapitre 3
-=======
-chapitre 3
->>>>>>> d1a684c6430ca036ad3cd6a38c47a27b5b42a374
+Chapitre 3
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 58b97d9..500a3c2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -71,6 +71,7 @@
 		"02-23",
 		"02-25",
 		"02-28",
+		"03-title",
 		"03-01",
 		"03-03",
 		"03-05",