From bbad16899030985ee03e4fd8f9685edb37bb6041 Mon Sep 17 00:00:00 2001 From: Paulinus_IT_kalimantan Date: Tue, 27 Aug 2019 11:33:29 +0700 Subject: [PATCH] auto save --- 01/13.txt | 6 ------ manifest.json | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/01/13.txt b/01/13.txt index a95105a..b372281 100644 --- a/01/13.txt +++ b/01/13.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 13 Naan ajoh hal sa kakan kuki tuliskan gi kayo, tapi kuki bakoi kakan nulis'e gi kayo nihi pena nihi tinta. -\v 14 Kuki berharap de nutah kayo hinang nihi taka sagar bapander secara bahadapan. -\v 15 Damai sejahtera gi kayo. Hengau-hengau ta iti ngirim tabe gi kayo. Hampe lei tabe kami gi setiap puloknai ta anai. -======= \v 13 Naan ajoh hal sa kakan kuki tuliskan gi kayo, tapi kuki bakoi kakan nulis'e gi kayo nihi pena nihi tinta. \v 14 Kuki berharap de nutah kayo hinang nihi taka sagar bapander secara bahadapan. \v 15 Damai sejahtera gi kayo. Hengau-hengau ta iti ngirim tabe gi kayo. Hampe lei tabe kami gi setiap puloknai ta anai. ->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Paulinus_IT_kalimantan/duw-x-dusunpepas_3jn_text_reg.git diff --git a/manifest.json b/manifest.json index 9e3c581..2fe3234 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"project":{"id":"3jn","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Dusun Pepas","direction":"ltr","anglicized_name":"Dusun Pepas","region":"Asia","is_gateway_language":false,"id":"duw-x-dusunpepas"},"format":"usfm","resource":{"id":"reg"},"translators":["Paulinus_IT_kalimantan","Dusun Pepas"],"source_translations":[{"language_id":"ayt","resource_id":"ulb","checking_level":"3","date_modified":-1,"version":"1"},{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180816,"version":"2016"}],"finished_chunks":["01-title","01-13","front-title","01-01","01-05","01-09","01-11"]} \ No newline at end of file +{"project":{"id":"3jn","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Dusun Pepas","direction":"ltr","anglicized_name":"Dusun Pepas","region":"Asia","is_gateway_language":false,"id":"duw-x-dusunpepas"},"format":"usfm","resource":{"id":"reg"},"translators":["Paulinus_IT_kalimantan","Dusun Pepas"],"source_translations":[{"language_id":"ayt","resource_id":"ulb","checking_level":"3","date_modified":-1,"version":"1"},{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180816,"version":"2016"}],"finished_chunks":["01-title","front-title","01-01","01-05","01-09","01-11","01-13"]} \ No newline at end of file