diff --git a/13/20.txt b/13/20.txt index 7710a01..983b8ba 100644 --- a/13/20.txt +++ b/13/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Ari ojo, “ngatiriri nan okabwe lo Lobanga ko nyio? \v 21 Ori iya ibula kuna lodumu ngorwani kileng lara kude to kana keken ikarutore kofwo kulo mugati ititukan na ibune fad.” -======= -\v 20 Ari ojo, “ngatiriri nan okabwe lo Lobanga ko nyio? \v 21 Ori iya ibula kuna lodumu ngorwani kileng lara kude to kana keken ikarutore kofwo kulo mugati ititukan na ibune fad” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 20 Ari ojo, “ngatiriri nan okabwe lo Lobanga ko nyio? \v 21 Ori iya ibula kuna lodumu ngorwani kileng lara kude to kana keken ikarutore kofwo kulo mugati ititukan na ibune fad” \ No newline at end of file diff --git a/13/25.txt b/13/25.txt index 8e236b6..807f0d8 100644 --- a/13/25.txt +++ b/13/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Kalowoju ja monye lo kaji igienihi agwala, iwoita mute ite oleng itotoho ilelia ijo, ‘Lahitok kingaju ja ohoi’. Ati inyahu mute inyi ojo, ‘ida nan ahiyen ite kode lofwonunore ningi’. \v 26 Ito mute ite ijo, ‘kidaha afa ohoi kimata manyu ko isi, manyu itiyena afa isi kikohin kuniyang’. \v 27 Ati kinyiahahi mute ite ojo, ‘ida nan ahiyen ite kode lofwonunore ningi. Ifwo ten diho nan, ite fad katiyok kulo rohojun!` -======= -\v 25 Kalowoju ja monye lo kaji igienihi agwala, iwoita mute ite oleng itotoho ilelia ijo, ‘Lahitok kingaju ja ohoi’. Ati inyahu mute inyi ojo, ‘ida nan ahiyen ite kode lofwonunore ningi’. \v 26 Ito mute ite ijo, ‘kidaha afa ohoi kimata manyu ko isi, manyu itiyena afa isi kikohin kuniyang’. \v 27 Ati kinyiahahi mute ite ojo, ‘ida nan ahiyen ite kode lofwonunore ningi. Ifwo ten diho nan, ite fad katiyok kulo rohojun! ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 25 Kalowoju ja monye lo kaji igienihi agwala, iwoita mute ite oleng itotoho ilelia ijo, ‘Lahitok kingaju ja ohoi’. Ati inyahu mute inyi ojo, ‘ida nan ahiyen ite kode lofwonunore ningi’. \v 26 Ito mute ite ijo, ‘kidaha afa ohoi kimata manyu ko isi, manyu itiyena afa isi kikohin kuniyang’. \v 27 Ati kinyiahahi mute ite ojo, ‘ida nan ahiyen ite kode lofwonunore ningi. Ifwo ten diho nan, ite fad katiyok kulo rohojun!` \ No newline at end of file diff --git a/13/28.txt b/13/28.txt index 590a0a7..53ca7db 100644 --- a/13/28.txt +++ b/13/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Ongon mute kicira ko komo lo kala ijia, kalideu mute ite Abram, Isak ko Jakob ko kamocak fad iyo okabwe lo Lobanga ojo ite tokenite kibirori. \v 29 Ofwonu mute cio to lotulunore ko lodoyore lo kolong ko to kai ko orof manyu itongoti fajihit kuneicieng iyo karama iyo okabwe lo Lobanga. \v 30 Dede ongon kuna lara lohicungi mute lara katemok ongon manyu katemok lara licung. -======= -\v 28 Ongon mute kicira ko komo lo kala ijia, kalideu mute ite Abram, Isak ko Jakob ko kamocak fad iyo okabwe lo Lobanga ojo ite tokenite kibirori. \v 29 Ofwonu mute cio to lotulunore ko lodoyore lo kolong ko to kai ko orof manyu itongoti fajihit kuneicieng iyo karama iyo okabwe lo Lobanga. \v 30 Dede ongon kuna lara lohicungi mute lara katemok ongon manyu katemok lara licung. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 28 Ongon mute kicira ko komo lo kala ijia, kalideu mute ite Abram, Isak ko Jakob ko kamocak fad iyo okabwe lo Lobanga ojo ite tokenite kibirori. \v 29 Ofwonu mute cio to lotulunore ko lodoyore lo kolong ko to kai ko orof manyu itongoti fajihit kuneicieng iyo karama iyo okabwe lo Lobanga. \v 30 Dede ongon kuna lara lohicungi mute lara katemok ongon manyu katemok lara licung. \ No newline at end of file diff --git a/13/34.txt b/13/34.txt index 2f04634..336e123 100644 --- a/13/34.txt +++ b/13/34.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 34 O Jerusalem, Jerusalem isi na lifada kamocak manyu icak to morutok kuna loculuni diho isi, kakeny baya awahare nan itutumuno tee kunino iya na lifurore ikokor tee kunenge iyo fuho kunenge ati ida isi iwak. \v 35 Tode longerihini kaji nino ara mura. Ahirihohi ite ida ca ite irihe ideu nan ari many mute kalijo, kikwama na lolotu to karana lo Lahitok”. -======= -\v 34 O Jerusalem, Jerusalem isi na lifada kamocak manyu icak to morutok kuna loculuni diho isi, kakeny baya awahare nan itutumuno tee kunino -iya na lifurore ikokor tee kunenge iyo fuho kunenge ati ida isi iwak. \v 35 Tode longerihini kaji nino ara mura. Ahirihohi ite ida ca ite irihe ideu nan ari many mute kalijo, kikwama na lolotu to karana lo Lahitok”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 34 O Jerusalem, Jerusalem isi na lifada kamocak manyu icak to morutok kuna loculuni diho isi, kakeny baya awahare nan itutumuno tee kunino iya na lifurore ikokor tee kunenge iyo fuho kunenge ati ida isi iwak. \v 35 Tode longerihini kaji nino ara mura. Ahirihohi ite ida ca ite irihe ideu nan ari many mute kalijo, kikwama na lolotu to karana lo Lahitok”. \ No newline at end of file diff --git a/manifest.json b/manifest.json index ef132c1..55279a1 100644 --- a/manifest.json +++ b/manifest.json @@ -190,8 +190,12 @@ "13-12", "13-17", "13-22", + "13-25", + "13-28", "13-31", + "13-34", "14-title", + "14-01", "14-04", "14-07", "14-10",