Fri Jan 24 2020 15:54:32 GMT-0500 (Eastern Standard Time)

2020-01-24 15:54:32 -05:00 · 2020-01-24 15:54:32 -05:00 · 395e3bd347
parent a5a99592ee
commit 395e3bd347
2 changed files with 2 additions and 5 deletions
--- a/03/title.txt
+++ b/03/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Chapitre 3
-=======
-chapitre 3
->>>>>>> d1a684c6430ca036ad3cd6a38c47a27b5b42a374
+Chapitre 3
--- a/manifest.json
+++ b/manifest.json
@ -71,6 +71,7 @@
 		"02-23",
 		"02-25",
 		"02-28",
+		"03-title",
 		"03-01",
 		"03-03",
 		"03-05",