From 0fbc388e2d51b9247aec234c6dcb8180930b9068 Mon Sep 17 00:00:00 2001 From: Jenkins Pongiura Date: Wed, 6 Sep 2023 11:14:56 +1000 Subject: [PATCH] auto save --- 01/11.txt | 5 ----- manifest.json | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/01/11.txt b/01/11.txt index 8ca4419..5f17546 100644 --- a/01/11.txt +++ b/01/11.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 11 Ya imababan, ya ne hel diqtamo gibilenaiq. Yesus awagamun dimunta ya bilaqaiqta ka mat araq og kabta eman a hi ghwahtimta. \v 12 Wagam na ya mat araq ago hib a hi huritta. Teq mat araq wagam na -asuleqin a hi yagtamo. Haiqgam. Yesus Krais-mo gamuk na iqisihunta. -======= \v 11 Pol in Aposel gwahtimta awagamun Ya imaqbaban, ya ne hel diqtaqmo gibilenaiq. Yesus awagamun dimunta ya bilaqaiqta ka mat araq og kabta eman a hi gwahtimta. \v 12 Wagam na ya mat araq ago hib a hi huritta. Teq mat araq Wagam na asuleqin a hi yagtamo. Haiqgam. Yesus Krais-mo gamuk na iqisihunta.. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-gabagsal_gal_text_reg.git diff --git a/manifest.json b/manifest.json index 23bfc93..81d2e08 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"gal","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":["f"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-title","04-title","05-title","06-title","front-title","01-01","01-03","01-06","01-08","01-11","06-01","06-03","06-09","06-17","06-06","06-11","05-25","05-22","05-11","05-03","05-05","05-09","06-14","05-13","05-16","05-19","05-01","03-23","03-21","03-19","03-17","03-15","03-13","03-10","03-06","03-04","03-01","03-title","02-20","02-17","02-15","02-13","02-11","02-09","02-06","02-03","02-01","02-title","01-21","01-18","01-15","01-13"]} \ No newline at end of file +{"project":{"id":"gal","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":["f"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-title","04-title","05-title","06-title","front-title","01-01","01-03","01-06","01-08","06-01","06-03","06-09","06-17","06-06","06-11","05-25","05-22","05-11","05-03","05-05","05-09","06-14","05-13","05-16","05-19","05-01","03-23","03-21","03-19","03-17","03-15","03-13","03-10","03-06","03-04","03-01","03-title","02-20","02-17","02-15","02-13","02-11","02-09","02-06","02-03","02-01","02-title","01-21","01-18","01-15","01-13","01-11"]} \ No newline at end of file