From 3948382e0296ba68d2ff86ce7ad4be5b614523d8 Mon Sep 17 00:00:00 2001 From: Pipero Bible Project Tab 2 Date: Wed, 7 Nov 2018 22:49:13 +0100 Subject: [PATCH] auto save --- 01/23.txt | 4 ---- manifest.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/01/23.txt b/01/23.txt index 2ea7b56..f3bdf78 100644 --- a/01/23.txt +++ b/01/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \v 23 Afafaras, anjeereno ta yeeno Almasihu Yeesu, tammina muɗuk, ti piɗi ƙaƙeema. \v 24 Pang kijimoi, ma Markus, ƙan Aristarkus, ƙan Dimas, ƙan Lukka, anjeere shurannọ. \v 25 Mu we shin wala, wẹẹno Tattạ mungbuɗe, Yeesu Almasihu, mu ɗiyạ ƙan shirimƙọ Mu ɗiyạn kijimmoi. -======= -\v 23 Afafaras, anjeere shurannọ, tamina muɗuk, ƙelangkuuno Yeesu Ammiratte, ti piɗi ƙaaƙẹẹkọn, \v 24 Pang kijimoi, ma Markus, ƙan Aristarkus, ƙan Dimas, ƙan Luka, anjẹẹre shuranno. \v 25 Mu we shin wala, wẹẹno Tatta Ankuyạmu, Yeesu Anmiratte, mu ɗiyạ ƙan ma. Mu ɗiyạn kiijimoi. ->>>>>>> branch 'master' of git@git.door43.org:pipero2/pip_phm_text_ulb.git diff --git a/manifest.json b/manifest.json index 284286f..6d34923 100644 --- a/manifest.json +++ b/manifest.json @@ -1 +1 @@ -{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":176},"target_language":{"direction":"ltr","id":"pip","name":"Pero"},"project":{"id":"phm","name":"Philemon"},"type":{"id":"text","name":"Text"},"resource":{"id":"ulb","name":"Unlocked Literal Bible"},"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"translators":["MAL","Danjuma_Alfred_H"],"finished_chunks":["01-title","front-title","01-21","01-23","01-17","01-14","01-10","01-08","01-04","01-01"]} \ No newline at end of file +{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":176},"target_language":{"direction":"ltr","id":"pip","name":"Pero"},"project":{"id":"phm","name":"Philemon"},"type":{"id":"text","name":"Text"},"resource":{"id":"ulb","name":"Unlocked Literal Bible"},"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"translators":["MAL","Danjuma_Alfred_H"],"finished_chunks":["01-title","front-title","01-21","01-17","01-14","01-10","01-08","01-04","01-01","01-23"]} \ No newline at end of file