Wed Sep 14 2016 09:13:32 GMT+0100 (W. Central Africa Standard Time)

2016-09-14 09:13:33 +01:00 · 2016-09-14 09:13:33 +01:00 · 96ab1907b2
parent 5846b16da7
commit 96ab1907b2
2 changed files with 2 additions and 5 deletions
--- a/00/title.txt
+++ b/00/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-́MAWU
-=======
-Luki
->>>>>>> a28e6c014e799a7dc5eeb24cce8d409f7e1963cc
+Luki
--- a/manifest.json
+++ b/manifest.json
@ -38,6 +38,7 @@
 		"parfait-ayanou"
 	],
 	"finished_chunks": [
+		"00-title",
 		"01-01",
 		"01-05",
 		"01-08",