From 9436aa29ee8ed4e3a808c8c6993ca57191a71f44 Mon Sep 17 00:00:00 2001 From: "bahasatech.indotengah" Date: Fri, 12 Mar 2021 11:36:47 +0700 Subject: [PATCH] Fri Mar 12 2021 11:36:47 GMT+0700 (SE Asia Standard Time) --- 02/16.txt | 14 +------------- 02/18.txt | 9 +-------- 02/20.txt | 6 +----- 02/22.txt | 6 +----- manifest.json | 4 ++++ 5 files changed, 8 insertions(+), 31 deletions(-) diff --git a/02/16.txt b/02/16.txt index 2a9cc36f..479ad0ef 100644 --- a/02/16.txt +++ b/02/16.txt @@ -1,13 +1 @@ -<<<<<<< HEAD -\v 16tabolo inne nyiwe hataki ledeni Nabi Yoel: -\v 17'Mono,talado hadukka waiyi enga dadige,Allah :nyidawe nauwa bi gumi Waddi-Gu tapanu tangana kadadi ata.Mono,anami kabani enga etada haeta,mono anami Lawaiyi enga naganipi tanga ngara naganipi,mono anami bau mane bau winne enga etada haeta,mono ata katumi ta jongami enga naganipida hanaganipida. -======= -\v 16Tabollo ine nyiwe hatakki ledeni Nabi Yoel: - -\v 17'Mono,ta laddo hadukka waiyi enga dadige, - Allah lina: - nyidawe nauwa enga bi' guni Waddi-Gu tapanu tangana kadadi Ata. - Mono,ana kabani mono ana lawaiyi enga hurbaleda, - mono ata bodimi enga eta'da haeta,mono - ata-ata katuna tajongami enga naga nipi tanga ngara naga nipi. ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 16 tabolo inne nyiwe hataki ledeni Nabi Yoel: \v 17 'Mono,talado hadukka waiyi enga dadige,Allah :nyidawe nauwa bi gumi Waddi-Gu tapanu tangana kadadi ata.Mono,anami kabani enga etada haeta,mono anami Lawaiyi enga naganipi tanga ngara naganipi,mono anami bau mane bau winne enga etada haeta,mono ata katumi ta jongami enga naganipida hanaganipida. \ No newline at end of file diff --git a/02/18.txt b/02/18.txt index 759422cf..c93617f1 100644 --- a/02/18.txt +++ b/02/18.txt @@ -1,8 +1 @@ -<<<<<<< HEAD -\v 18Lodoge,tapanu tangada ata-Gu kabani mono tangada ata-Gu lawaiyi ta lado inala,Nauwa ugu bi hogumi Waddi-Gu mono yida enga huru baleda.\v 19Mono,Nauwa enga hatingo daguge Mujizat-mujizat ta Langta,kadauwu dete,mono tadka-tadka hangatara danga ta panu tana,kadauwu bawa,rayo,mono latti,mono hammu habongi. -======= -\v 18Lodoge,ta pannu tangada atagu kabani mono tangada atagu lawaiyi ta laddo inne la,Nauwa ugu bi' homi Waddi-Gu, - mono yidda enga hurr baleda. - \v 19Mono,Nauwa enga hatingo daguge Mujzat-mijizat ta langta,hadawu dete, -mono tadka-tadka hangatara tapanu tana,hadawu bawa ,Ra'yo mono latti mono hammu habongu. ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 18 Lodoge,tapanu tangada ata-Gu kabani mono tangada ata-Gu lawaiyi ta lado inala,Nauwa ugu bi hogumi Waddi-Gu mono yida enga huru baleda. \v 19 Mono,Nauwa enga hatingo daguge Mujizat-mujizat ta Langta,kadauwu dete,mono tadka-tadka hangatara danga ta panu tana,kadauwu bawa,rayo,mono latti,mono hammu habongi. \ No newline at end of file diff --git a/02/20.txt b/02/20.txt index b45401aa..51f47d70 100644 --- a/02/20.txt +++ b/02/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20Mata laddo engana hajeluna dadi kapagta mono wulla dadi rayo,aina diki howe ladonai Mori kamadakka mono kamanadana ba ammini.\v 21Mono enga dadige,tanagana ata ka maikage ngaranai Mori enga pahoilayi." -======= -\v 20Mata lado engana hajeluna dadi kapagta mono wulla nadadi Rayo,aina diki howe ladonai Mori kana dakka mono kana manadana ba ammini.\v 21Mono enga dadige,tangana ata kamaikage Ngaranai Mori enga pahoilayi. ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 20 Mata laddo engana hajeluna dadi kapagta mono wulla dadi rayo,aina diki howe ladonai Mori kamadakka mono kamanadana ba ammini. \v 21 Mono enga dadige,tanagana ata ka maikage ngaranai Mori enga pahoilayi." \ No newline at end of file diff --git a/02/22.txt b/02/22.txt index 19680651..7a96614c 100644 --- a/02/22.txt +++ b/02/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 "Ta,ata Israel,rangewe inne,Yesus ata Nazaret,wuyi ata pahadelakabe ta jongami i' Allah waige hada hangatara danga,mono Mujizat-mujizat,mono tadka-tadka hatingo benai Allah ta jongami ledeni nyiyo,tauna miyo wiki dauwu tadawe.\v 23Yesus nade,paha palabe dokuge hakabu ate paha yanna bena mono hatada benai Allah ulluge,pahamatemi waige bamu kadailoni lededi limmada ata bokala.\v 24Tabolo,Allah nahakadde haggai,mono napahallayi wali tamayilla mate oro wale nadadikmawe tubana bana parehayi mate. -======= -\v 22" Ta' ata Israel,rangewe hanewe inne,Yesus ata Nazaret,wuyi ata pahadelakabe tajongami iy Allah waige waige hada hangatara danga,mono mujizat-mujizat,mono tadka-tadka,hatingo benai Allah tajongami ledeni Nyi,wiki dawu tadawe.\v 23Yesus nade,pa hapala dokuge hakabu ate paha yanna bena mono hatada benai Allah ulluge,paha matena waige bamu kadailo-Ni lededi limada ata bokala.\v 24Tabolola,Allah nakadde hagaga-Yi mono pahalla-Yi wali kamayilla mate oro wale nadaik'mawe tubana parehayi mate. ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 22 " Ta' ata Israel,rangewe hanewe inne,Yesus ata Nazaret,wuyi ata pahadelakabe tajongami iy Allah waige waige hada hangatara danga,mono mujizat-mujizat,mono tadka-tadka,hatingo benai Allah tajongami ledeni Nyi,wiki dawu tadawe. \v 23 Yesus nade,pa hapala dokuge hakabu ate paha yanna bena mono hatada benai Allah ulluge,paha matena waige bamu kadailo-Ni lededi limada ata bokala. \v 24 Tabolola,Allah nakadde hagaga-Yi mono pahalla-Yi wali kamayilla mate oro wale nadaik'mawe tubana parehayi mate. \ No newline at end of file diff --git a/manifest.json b/manifest.json index b035b185..1038dbd3 100644 --- a/manifest.json +++ b/manifest.json @@ -65,6 +65,10 @@ "02-08", "02-12", "02-14", + "02-16", + "02-18", + "02-20", + "02-22", "03-title", "04-title", "05-title",