diff --git a/00/title.txt b/00/title.txt index f142500e..19863bad 100644 --- a/00/title.txt +++ b/00/title.txt @@ -1 +1,5 @@ -MATAYO \ No newline at end of file +<<<<<<< HEAD +MATAYO +======= +Matayo +>>>>>>> refs/heads/new diff --git a/01/09.txt b/01/09.txt index 6384b729..aa8dbbd1 100644 --- a/01/09.txt +++ b/01/09.txt @@ -1 +1,5 @@ -\v 9 Nu Uzia abutile Yotamu nu Yotamuabutile Ahazi nu Ahazi abutile Hezekia \v 10 nu Hezekia abutile Manase nu Manase abutile Amoni nu Amoni abutile Yosia \v 11 nu Yosia abutile Yekonia nu mibuto saghe mu bindi bibendagha mo ku bukobe ku Babeli. \ No newline at end of file +<<<<<<< HEAD +\v 9 Nu Uzia abutile Yotamu nu Yotamuabutile Ahazi nu Ahazi abutile Hezekia \v 10 nu Hezekia abutile Manase nu Manase abutile Amoni nu Amoni abutile Yosia \v 11 nu Yosia abutile Yekonia nu mibuto saghe mu bindi bibendagha mo ku bukobe ku Babeli. +======= +MA +>>>>>>> refs/heads/new diff --git a/manifest.json b/manifest.json index eca37a8f..47c3d4c4 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"mat","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":138},"package_version":6,"target_language":{"direction":"ltr","id":"khx","name":"Kanu"},"format":"usfm","resource":{"id":"reg"},"translators":["Faustin"],"source_translations":[{"language_id":"en","resource_id":"udb","checking_level":3,"date_modified":20160614,"version":"5"}],"finished_chunks":["00-title","01-04","01-07","01-09","01-12","01-15","01-18","01-22","10-40","10-42","11-01","11-04","11-07","11-09","11-13","11-16","11-18","11-20","11-23","11-25","11-28","12-01","11-11","12-03","12-05","12-07","12-09","12-11","12-13","12-15","12-18","12-19","02-09","02-11","02-13","12-22","12-24","12-26","12-28","02-16","02-17","04-05","04-07","04-10","04-12","01-01","01-20","01-24","02-01","02-04","02-07","04-01","02-19","02-22"]} \ No newline at end of file +{"project":{"id":"mat","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":138},"package_version":6,"target_language":{"direction":"ltr","id":"khx","name":"Kanu"},"format":"usfm","resource":{"id":"reg"},"translators":["Faustin","faustin-azaza"],"source_translations":[{"language_id":"en","resource_id":"udb","checking_level":3,"date_modified":20160614,"version":"5"},{"language_id":"en","resource_id":"udb","checking_level":3,"date_modified":20160614,"version":"5"}],"finished_chunks":["00-title","01-04","01-07","01-09","01-12","01-15","01-18","01-22","10-40","10-42","11-01","11-04","11-07","11-09","11-13","11-16","11-18","11-20","11-23","11-25","11-28","12-01","11-11","12-03","12-05","12-07","12-09","12-11","12-13","12-15","12-18","12-19","02-09","02-11","02-13","12-22","12-24","12-26","12-28","02-16","02-17","04-05","04-07","04-10","04-12","01-01","01-20","01-24","02-01","02-04","02-07","04-01","02-19","02-22"]} \ No newline at end of file