diff --git a/front/title.txt b/front/title.txt index 07c88b4..df956da 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Tite -======= Tito ->>>>>>> refs/heads/new diff --git a/manifest.json b/manifest.json index 4f14a91..56ae1e9 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"tit","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Lengola","direction":"ltr","anglicized_name":"Lengola","region":"Africa","is_gateway_language":false,"id":"lej"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin-azaza"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-title","front-title","03-title","03-01","03-03","03-04","03-06","03-08","03-09","03-12","03-14","03-15","01-01","01-04","01-06","01-08","01-10","01-12","01-15","02-title"]} \ No newline at end of file +{"project":{"id":"tit","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Lengola","direction":"ltr","anglicized_name":"Lengola","region":"Africa","is_gateway_language":false,"id":"lej"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin-azaza"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["03-title","03-01","03-03","03-04","03-06","03-08","03-09","03-12","03-14","03-15","01-01","01-04","01-06","01-08","01-10","01-12","01-15","02-title","01-title"]} \ No newline at end of file