From 956e3f69dd323a53f9b0c9e7f5e2b5a77583482d Mon Sep 17 00:00:00 2001 From: Jenkins Pongiura Date: Wed, 6 Sep 2023 11:28:59 +1000 Subject: [PATCH] auto save --- 03/20.txt | 4 ---- manifest.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/03/20.txt b/03/20.txt index 7ac0599..a9bf073 100644 --- a/03/20.txt +++ b/03/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \v 20 Ari God ago zaway i gigemab kabiy emaqta na amalib in i gidimun diq tonaqta. Teq i ginad emad susumun ugauqta na in i igad in nagah asor i inadin a hi emqta ta inaqmo em igaqtamo. Igsa i nilingo biyab haiq. \v 21 Nazaq iyan kam bunmo tuteqmo on mataw Krais ago nan huritayta na in God abin iluwiy. Sa God in Krais Yesus ago hib abin ayahta waqanmo. Waqsa daq na muran useq le on mataw gidauhan abeb teq gwahtiq daqay na gigo kamub iyeq in nazaqmo leh tutan. Hel diqtaqmo. -======= -\v 20 Ari God ago zaway i gigemab kabiy emaqta na amalibin i gidimun diq tonaqta. Teq i ginad emad susumun ugauqta na in i igad in nagah asor i anadin a hi emta inaqmo em igaqtamo. Igsa i nulingo biyab haiq. \v 21 Nazaq iyan kam bunmo tuteqmo on mataw Krais ago nan huritayta na in God abin iluwiy. Sa God in Krais Yesus ago hib abin ayahta waqanmo. Waqsa daq na muran useq le on mataw gidauhan abeb teq gwahtiq daqay na gigo kamub iyeq in nazaqmo leh tutan. Hel diqtaqmo ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-gabagsal_eph_text_reg.git diff --git a/manifest.json b/manifest.json index f4d6473..245031c 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"eph","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":["gabagsal","PJenkins"],"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":"2017-11-29T00:00:00+00:00","version":"12"}],"finished_chunks":["01-title","06-04","06-05","06-01","06-14","06-12","06-10","06-09","05-13","05-03","04-09","05-01","04-11","03-20","04-23","04-01","04-04","04-07","04-14","04-17","04-20","04-25","04-28","06-19","06-21","06-23","06-17","05-05","05-08","05-15","04-31","05-18","05-22","05-25","05-28","05-31","04-title","05-title","06-title","01-01","01-03","01-05","01-07","01-09","01-11","01-13","01-15","01-17","01-19","01-22","02-title","02-01","02-04","02-08","02-11","02-13","02-17","02-19","03-title","03-01","03-03","03-06","03-08","03-10","03-12","03-14","03-17"]} \ No newline at end of file +{"project":{"id":"eph","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":["gabagsal","PJenkins"],"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":"2017-11-29T00:00:00+00:00","version":"12"}],"finished_chunks":["01-title","06-04","06-05","06-01","06-14","06-12","06-10","06-09","05-13","05-03","04-09","05-01","04-11","04-23","04-01","04-04","04-07","04-14","04-17","04-20","04-25","04-28","06-19","06-21","06-23","06-17","05-05","05-08","05-15","04-31","05-18","05-22","05-25","05-28","05-31","04-title","05-title","06-title","01-01","01-03","01-05","01-07","01-09","01-11","01-13","01-15","01-17","01-19","01-22","02-title","02-01","02-04","02-08","02-11","02-13","02-17","02-19","03-title","03-01","03-03","03-06","03-08","03-10","03-12","03-14","03-17","03-20"]} \ No newline at end of file