Thu Oct 24 2019 18:21:29 GMT-0700 (Pacific Daylight Time)

2019-10-24 18:21:29 -07:00 · 2019-10-24 18:21:29 -07:00 · ee19dba881
parent 0913891869
commit ee19dba881
2 changed files with 2 additions and 5 deletions
--- a/10/title.txt
+++ b/10/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Toko 10
-=======
-Toko faha 10
->>>>>>> f9edbf06eb54712ccb96bead9ecb5f47937276a2
+Toko faha 10
--- a/manifest.json
+++ b/manifest.json
@ -203,6 +203,7 @@
 		"09-45",
 		"09-47",
 		"09-49",
+		"10-title",
 		"10-01",
 		"10-05",
 		"10-07",