diff --git a/23/36.txt b/23/36.txt index 570c3d5..4d0e012 100644 --- a/23/36.txt +++ b/23/36.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 36 Ofwonu manyu asegere okwenitare inyi icori inyi vino na itatang \v 37 ojimi diho inyi, “kalira isi kabu lo Judea, tolwahu ken nino”. \v 38 Orumu ongon kigero na lofihi kai lo kuruce nenge na ligero ojo ene lara Kabu Lo Judea. -======= -\v 36 Ofwonu manyu asegere okwenitare inyi icori inyi vino na itatang \v 37 ojimi diho inyi, “kalira isi kabu lo Judea, tolwahu ken nino”. \v 38 Orumu ongon -kigero na lofihi kai lo kuruce nenge na ligero ojo ENE LARA KABU LO JUDEA. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 36 Ofwonu manyu asegere okwenitare inyi icori inyi vino na itatang \v 37 ojimi diho inyi, “kalira isi kabu lo Judea, tolwahu ken nino”. \v 38 Orumu ongon kigero na lofihi kai lo kuruce nenge na ligero ojo ene lara Kabu Lo Judea. \ No newline at end of file diff --git a/23/39.txt b/23/39.txt index 1858a66..9be1407 100644 --- a/23/39.txt +++ b/23/39.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 39 Lobito diho kuladi kabelak logurohini ko inyi manyu omor inyi ojo, “Ira isi kristo tolwahu ken nino ko ohoi”. \v 40 Ati irieng na kabelani bito inyi ojo, “ida isi ibang Lobanga, iya na lingonore isi ko inyi iyo kidak ara lobito? \v 41 Kicori ohoi niyang obehi, tonyio kirumuno ohoi tohi na locam to tic niyang. Ati ida ene tungani itii lobo tohi irohoi”. -======= -\v 39 Lobito diho kuladi kabelak logurohini ko inyi manyu omor inyi ojo, “Ira isi kristo tolwahu ken nino ko ohoi”. \v 40 Ati irieng na kabelani bito inyi ojo, “ida isi ibang Lobanga, iya na lingonore isi ko inyi iyo kidak ara lobito? \v 41 Kicori ohoi niyang obehi, tonyio kirumuno ohoi tohi na locam to tic niyang. Ati ida ene tungani itii lobo tohi irohoi”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 39 Lobito diho kuladi kabelak logurohini ko inyi manyu omor inyi ojo, “Ira isi kristo tolwahu ken nino ko ohoi”. \v 40 Ati irieng na kabelani bito inyi ojo, “ida isi ibang Lobanga, iya na lingonore isi ko inyi iyo kidak ara lobito? \v 41 Kicori ohoi niyang obehi, tonyio kirumuno ohoi tohi na locam to tic niyang. Ati ida ene tungani itii lobo tohi iroho.” \ No newline at end of file diff --git a/23/42.txt b/23/42.txt index 9bd9bb1..d034dbd 100644 --- a/23/42.txt +++ b/23/42.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 42 Oto ko jimitan, “Yesu kiiu nan kalilotu isi okabwe nino”. \v 43 Ifotu Yesu inyi ojo, “Ahirihohi isi tenya lo dede ene far kingon ca isi ko nan Paradise’. -======= -\v 42 Oto ko jimitan, “Yesu kiiu nan kalilotu isi okabwe nino”. \v 43 Ifotu Yesu inyi ojo, “Ahirihohi isi tenya lo dede ene far kingon ca isi ko nan Paradise’. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 42 Oto ko jimitan, “Yesu kiiu nan kalilotu isi okabwe nino”. \v 43 Ifotu Yesu inyi ojo, “Ahirihohi isi tenya lo dede ene far kingon ca isi ko nan Paradise." \ No newline at end of file diff --git a/23/52.txt b/23/52.txt index e6ed4e0..1396713 100644 --- a/23/52.txt +++ b/23/52.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 52 Olo diho Pilato kilifa ken lo Yesu. \v 53 Oto ko kiticuluno kof, obubur to kyela iribi ko kitigetohino tula na lobohuni iyo moru na lorihe ara ngejuk ida lonuhahini lobo tungani. -======= -\v 52 Olo diho Pilato kilifa ken lo Yesu. \v 53 Oto ko kiticuluno kof, obubur to kyela iribi ko kitigetohino tula na lobohuni iyo moru na lorihe ara ngejuk ida lonuhahini lobo tungani. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 52 Olo diho Pilato kilifa ken lo Yesu. \v 53 Oto ko kiticuluno kof, obubur to kyela iribi ko kitigetohino tula na lobohuni iyo moru na lorihe ara ngejuk ida lonuhahini lobo tungani. \ No newline at end of file diff --git a/23/54.txt b/23/54.txt index 7a1426c..94efbc6 100644 --- a/23/54.txt +++ b/23/54.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 54 Orumu lafar ara far lo kikukumahino manyu lonyiha sabit icaha. \v 55 Ngorwo kuna lilihu ko Yesu to Galilea, ijifari Josep manyu odeuni kwecere ko koditi na litigetohinorehin ken lo Yesu katwa nenge. Ko itooti ki kukuma iheru \v 56 ko ngoronico kuna iuri. Ati iyoma icieng to sabit lo kijifita cihicihi. -======= -\v 54 Orumu lafar ara far lo kikukumahino manyu lonyiha sabit icaha. \v 55 Ngorwo kuna lilihu ko Yesu to Galilea, ijifari Josep manyu odeuni kwecere ko koditi na litigetohinorehin ken lo Yesu katwa nenge. Ko itooti ki kukuma iheru \v 56 ko ngoronico kuna iuri. Ati iyoma icieng to sabit lo kijifita cihicihi! ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 54 Orumu lafar ara far lo kikukumahino manyu lonyiha sabit icaha. \v 55 Ngorwo kuna lilihu ko Yesu to Galilea, ijifari Josep manyu odeuni kwecere ko koditi na litigetohinorehin ken lo Yesu katwa nenge. Ko itooti ki kukuma iheru \v 56 ko ngoronico kuna iuri. Ati iyoma icieng to sabit lo kijifita cihicihi. \ No newline at end of file diff --git a/24/01.txt b/24/01.txt index 58371c4..8b811b8 100644 --- a/24/01.txt +++ b/24/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 24 \v 1 To far kiteri lo sabit, kiwanyi berien, odumu ngorwo cianitok kuna likukum icieng ko fworoti kwecere. \v 2 Orumu icieng moru litiboborori to kutuk lo tula. \v 3 Ati ojo icieng orute, ida icieng orumu ken lo Lahitok Yesu. -======= -\c 24 \v 1 To far kiteri lo sabit, kiwanyi berien, odumu ngorwo cianitok kuna likukum icieng ko fworoti -kwecere. \v 2 Orumu icieng moru litiboborori to kutuk lo tula. \v 3 Ati ojo icieng orute, ida icieng orumu ken lo Lahitok Yesu. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 24 \v 1 To far kiteri lo sabit, kiwanyi berien, odumu ngorwo cianitok kuna likukum icieng ko fworoti kwecere. \v 2 Orumu icieng moru litiboborori to kutuk lo tula. \v 3 Ati ojo icieng orute, ida icieng orumu ken lo Lahitok Yesu. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 90a35ba..08a6ce7 100644 --- a/manifest.json +++ b/manifest.json @@ -520,11 +520,18 @@ "23-29", "23-32", "23-33", + "23-35", + "23-36", + "23-39", + "23-42", "23-44", "23-46", "23-48", "23-50", + "23-52", + "23-54", "24-title", + "24-01", "24-11", "24-28", "24-44",