From e329e6cb851c4e4289c63b48088f411219f4b57d Mon Sep 17 00:00:00 2001 From: Lawadinusah Date: Wed, 16 Sep 2020 11:19:07 +0700 Subject: [PATCH] Wed Sep 16 2020 11:19:06 GMT+0700 (SE Asia Standard Time) --- 04/02.txt | 6 +----- manifest.json | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/04/02.txt b/04/02.txt index a642677..b136300 100644 --- a/04/02.txt +++ b/04/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Tekutn dalapm doa, bejaga tamah mengucap sukor. \v 3 Bedoa gak ke kami supaya Allah mukak lawankng ke firman kalau kami tau memproklamasi rahasia Kristus, bante aku dipenjara. \v 4 bedoa supaya aku dapat madah tamah jelas dimak searuse aku ngomong. -======= -\v 2 Tekutn dalapm doa, bejaga tamah mengucap sukor.\v 3 Bedoa gak ke kami supaya Allah mukak lawankng ke firman kalau kami tau memproklamasi rahasia Kristus, bante aku dipenjara. \v 4 bedoa supaya aku dapat madah tamah jelas dimak searuse aku ngomong. ->>>>>>> 9c08486db6bade5e39d158e63cd9b8e176a022ed +\v 2 Tekutn dalapm doa, bejaga tamah mengucap sukor. \v 3 Bedoa gak ke kami supaya Allah mukak lawankng ke firman kalau kami tau memproklamasi rahasia Kristus, bante aku dipenjara. \v 4 bedoa supaya aku dapat madah tamah jelas dimak searuse aku ngomong. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8fc67ce..5b9a9b9 100644 --- a/manifest.json +++ b/manifest.json @@ -35,7 +35,8 @@ ], "translators": [ "teresia eti", - "DONATUS SEMBRATA" + "DONATUS SEMBRATA", + "dayakbajare" ], "finished_chunks": [ "front-title", @@ -71,6 +72,7 @@ "03-22", "04-title", "04-01", + "04-02", "04-05", "04-07", "04-10",