From d0b6346c0bb5ecd11732eb2b2cfe49c183e95414 Mon Sep 17 00:00:00 2001 From: Jenkins Pongiura Date: Wed, 6 Sep 2023 11:28:59 +1000 Subject: [PATCH] auto save --- 06/21.txt | 4 ---- 06/23.txt | 4 ---- manifest.json | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/06/21.txt b/06/21.txt index 00a16cd..024dd87 100644 --- a/06/21.txt +++ b/06/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Ari ya kab ezaq iyim osaiqta na teq ya naga emad osaiqta na ago Tikikus tigibilendaq. Tikikus in i gimaqbab araq dimun diqta. Teq in Ayahta kabiy ugta na emad atuw a hi hiqiyaqta.\v 22 Ya in eman nawa lehim i ezaq diq osauqta na ago teq in ne gibilensa ne gigem zaway tiqiydaq. -======= \v 21 Ari ya kab ezaq iyim osaiqta na teq ya naga emad osaiqta na ago Tikikus tigibilendaq. Tikikus in i gimaqbab araq dimun diqta.Teq i Iyahta kabiy ugta na emad atuw a hi hiqiyaqta. \v 22 Ya in eman nawa lehim i ezaq diq osauqta na ago teq in ne gibilensa negigem zaway tiqiydaq. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-gabagsal_eph_text_reg.git diff --git a/06/23.txt b/06/23.txt index 87dc880..28c8685 100644 --- a/06/23.txt +++ b/06/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Ari i Gimam God teq Ayahta Yesus Krais inaq ne on mataw Krais abin wazinayta na bunmo giumsihsa ne gigem kute nemsa osiy. Osad ne ginad helmota na waz naqmo hiqiyad ne an anan ginad bilaqsa osiy. \v 24 Ari on mataw tutimmo i gigo Ayahta Yesus Krais anan ginad bilaqaqta na bunmo God in agem dimunta negsa in osiy. Nawaqmo. -======= \v 23 Ari i Gimam God teq Iyahta Yesus Krais inaq in ne on mataw Krais abin wazinayta na bunmo gilumsihsa ne gigem kute nemsa osiy. Osad ne ginad helmota na waz naqmo hiqiyad ne an anan ginad bilaqsa osiy. \v 24 Ari on mataw tutimo i gigo Iyahta Yesus Krais anan ginad bilaqaqta na bunmo God in agem dimunta negsa in osiy. Nawaqmo. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-gabagsal_eph_text_reg.git diff --git a/manifest.json b/manifest.json index f882114..556452d 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","05-01","04-23","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","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","04-title","04-01","04-04","04-07","04-09","04-14","05-title"]} \ 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","05-01","04-23","04-20","04-25","04-28","06-19","06-17","05-05","05-08","05-15","04-31","05-18","05-22","05-25","05-28","05-31","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","04-title","04-01","04-04","04-07","04-09","04-14","05-title","front-title"]} \ No newline at end of file