From aea2d987c4986ba7343051097a92c959be86698f Mon Sep 17 00:00:00 2001 From: Jenkins Pongiura Date: Wed, 6 Sep 2023 11:55:06 +1000 Subject: [PATCH] auto save --- 01/01.txt | 4 ---- manifest.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/01/01.txt b/01/01.txt index bc2bbac..42f2e7c 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD \v 1 Yaqmo Pol, ya God ago kabibiy may teq ya Yesus Krais ago Aposel-mo. Ya God ago on mataw in gilumim aholyon giwamta na gilumsihsaq in gigo ginad helta na awaz tumeqniydaq haqad in ya iqeman ya in ago kabiy ka emaiqta. Teq ya God ago gamuk helta na on mataw gibilensaq in ginad em hasad God ago daq dimdimunta naqmo emad os daqay haqad in kabiy kab iqamta. \v 2 Iqeman ya God ago on mataw na gimen kabiy emsa in God anan helmo haqad in os dimunta kuluwa-kuluwmo os daqayta na amen emad tuqosayta. Kwaziq diqmo God in og ka eman a hi gwahtiqsamo in ago on mataw os dimunta na negnan hel diqmo bilamta. Ad in a hi katiyaqta. \v 3 God i Gilumsihim Giwaqaqta na in nazaq bilaqim teq abeb kam inmo anad usta nabmo in ya iwaqim ibenab kabiy eman ya in ago gamuk na waqim bilaqsa ulal tiqiyaq. -======= -Gabagsal Mathew v4 Sa Rom in Abraham amam. Sam Abraham in Nason in Solmon amam.v5 Salmon in Bowaz Bowaz amam. Teq Bowaz anen Rahab. Sa Bowaz in Obet amam.Teq Obet anen Rut. Sa Obet in Jesi amam.v6 Sa Jesi in Isrel gigo king Davit amam. teq Davit in Solomon amam. Solomon anen in kwaziqmo mat anan Uriya haqayta na aweq iyim osta. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-gabagsal_tit_text_reg.git diff --git a/manifest.json b/manifest.json index 79bb107..e8bd6fc 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"tit","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Gabagsal","direction":"ltr","anglicized_name":"","region":"Papua New Guinea ","is_gateway_language":false,"id":"mlp-x-gabagsal"},"format":"usfm","resource":{"id":"reg"},"translators":["Jenkins Pongiura","Gabagsal Translators ","ezawqham"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20220324,"version":"21-05"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["front-title","01-01","01-04","01-06","01-08","01-10","02-title","02-01","02-03","02-06","02-14","02-15","03-title","03-01","03-03","03-04","03-08","03-12","03-14","03-15","02-11","03-06","03-09","01-12","01-15","02-09","01-title"]} \ No newline at end of file +{"project":{"id":"tit","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Gabagsal","direction":"ltr","anglicized_name":"","region":"Papua New Guinea ","is_gateway_language":false,"id":"mlp-x-gabagsal"},"format":"usfm","resource":{"id":"reg"},"translators":["Jenkins Pongiura","Gabagsal Translators ","ezawqham"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20220324,"version":"21-05"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["front-title","01-04","01-06","01-08","01-10","02-title","02-01","02-03","02-06","02-14","02-15","03-title","03-01","03-03","03-04","03-08","03-12","03-14","03-15","02-11","03-06","03-09","01-12","01-15","02-09","01-title","01-01"]} \ No newline at end of file