From 9c0974d554069939c4dda96b3f0fc2aa8c0237ec Mon Sep 17 00:00:00 2001 From: klero Date: Wed, 2 Nov 2022 13:30:08 +0200 Subject: [PATCH] Wed Nov 02 2022 13:30:08 GMT+0200 (Central Africa Time) --- 17/25.txt | 6 +----- 17/28.txt | 6 +----- 17/30.txt | 6 +----- 17/32.txt | 6 +----- 17/34.txt | 6 +----- 17/37.txt | 6 +----- 18/01.txt | 6 +----- manifest.json | 6 ++++++ 8 files changed, 13 insertions(+), 35 deletions(-) diff --git a/17/25.txt b/17/25.txt index 962b514..84f1f95 100644 --- a/17/25.txt +++ b/17/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Ati ketemoni re ojir iticani re many oberu ene kofiangiti inyi”. \v 26 Iya lafa to faritin kulo Noa ori manyu mute ji to far lo kito lo tungani, odaha afa cio omatati, oyemati, \v 27 itiyemati many far na lorutorore Noa katwa lo tigol. Oto hati kifi ko fwonuno kerihino icieng fad. -======= -\v 25 Ati ketemoni re ojir iticani re many oberu ene kofiangiti inyi”. \v 26 Iya lafa to faritin kulo Noa ori manyu mute ji to far lo kito lo tungani, odaha afa cio omatati, oyemati, \v 27 itiyemati many far na lorutorore Noa katwa lo tigol. Oto hati kifi ko fwonuno kerihino icieng fad. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 25 Ati ketemoni re ojir iticani re many oberu ene kofiangiti inyi”. \v 26 Iya lafa to faritin kulo Noa ori manyu mute ji to far lo kito lo tungani, odaha afa cio omatati, oyemati, \v 27 itiyemati many far na lorutorore Noa katwa lo tigol. Oto hati kifi ko fwonuno kerihino icieng fad. \ No newline at end of file diff --git a/17/28.txt b/17/28.txt index b319f9c..e45380a 100644 --- a/17/28.txt +++ b/17/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Ori manyu afa ji to faritin kulo Lot. Odaha afa cio, omatati, inyiangati, itilototi, itibulati, ifahati kajihit \v 29 ati far na longerihinore Lot Sodom, kima ko salfa ko ca to kai ko keruno icieng fad. -======= -\v 28 Ori manyu afa ji to faritin kulo Lot. Odaha afa cio, omatati, inyiangati, itilototi, itibulati, ifahati kajihit \v 29 ati far na longerihinore Lot Sodom, kima ko salfa ko ca to kai ko keruno icieng fad. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 28 Ori manyu afa ji to faritin kulo Lot. Odaha afa cio, omatati, inyiangati, itilototi, itibulati, ifahati kajihit \v 29 ati far na longerihinore Lot Sodom, kima ko salfa ko ca to kai ko keruno icieng fad. \ No newline at end of file diff --git a/17/30.txt b/17/30.txt index 2281387..9be52b5 100644 --- a/17/30.txt +++ b/17/30.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 30 Ori mute ji token far na lobotore kito lo tungani. \v 31 Na far mute oru tungani na longon kai lo kaji nenge, sangite ongon katwa lo kaji lo lo mute odumu icieng. Iya na oru tungani longon mana lifeju ojo ayomuno lobo tohi. -======= -\v 30 Ori mute ji token far na lobotore kito lo tungani. \v 31 Na far mute oru tungani na longon kai lo kaji nenge, sangite ongon katwa lo kaji lo lo mute odumu icieng. Iya na oru tungani longon mana lifeju ojo ayomuno lobo tohi. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 30 Ori mute ji token far na lobotore kito lo tungani. \v 31 Na far mute oru tungani na longon kai lo kaji nenge, sangite ongon katwa lo kaji lo lo mute odumu icieng. Iya na oru tungani longon mana lifeju ojo ayomuno lobo tohi. \ No newline at end of file diff --git a/17/32.txt b/17/32.txt index c70c475..540a21e 100644 --- a/17/32.txt +++ b/17/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 32 Ibuhati ngorwani lo Lot. \v 33 Tungani na lotem rica warun nenge itiri mute manyu na litiri warun nenge oricahi mute. -======= -\v 32 Ibuhati ngorwani lo Lot. \v 33 Tungani na lotem rica warun nenge itiri mute manyu na litiri warun nenge oricahi mute. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 32 Ibuhati ngorwani lo Lot. \v 33 Tungani na lotem rica warun nenge itiri mute manyu na litiri warun nenge oricahi mute. \ No newline at end of file diff --git a/17/34.txt b/17/34.txt index d0dc2e3..2fce5f3 100644 --- a/17/34.txt +++ b/17/34.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 34 Ahirihohi ite na karwe ongon mute cio are lagere lobito iyari mute otong lobito. \v 35 Iya mute ngorwo are kirie, iyari mute lobito otong lobito. \v 36 Ongon mute cio are mana, iyari lobito lobito otong. -======= -\v 34 Ahirihohi ite na karwe ongon mute cio are lagere lobito iyari mute otong lobito. \v 35 Iya mute ngorwo are kirie, iyari mute lobito otong lobito. \v 36 Ongon mute cio are mana, iyari lobito lobito otong. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 34 Ahirihohi ite na karwe ongon mute cio are lagere lobito iyari mute otong lobito. \v 35 Iya mute ngorwo are kirie, iyari mute lobito otong lobito. \v 36 Ongon mute cio are mana, iyari lobito lobito otong. \ No newline at end of file diff --git a/17/37.txt b/17/37.txt index d5be83b..dab76b5 100644 --- a/17/37.txt +++ b/17/37.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 37 Itifi icieng ojo, “Aji Lahitok”. Inyiahahi inyi ojo, “Faji na longon tohi na iwei, otuba Itifi icieng ojo, “Aji Lahitok”. Inyiahahi inyi ojo, “Faji na longon tohi na iwei, otuba taruha”. -======= -\v 37 Itifi icieng ojo, “Aji Lahitok”. Inyiahahi inyi ojo, “Faji na longon tohi na iwei, otuba taruha”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 37 Itifi icieng ojo, “Aji Lahitok”. Inyiahahi inyi ojo, “Faji na longon tohi na iwei, otuba taruha”. \ No newline at end of file diff --git a/18/01.txt b/18/01.txt index 8893a77..894dfbd 100644 --- a/18/01.txt +++ b/18/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 18 \v 1 Oto Yesu orihohi jayona kunenge kitisirani lo rihohino icieng jimitan ojir ilifati ida oniemaha. \v 2 Oto ojo, “Iyo lobo kang afa, ongon lobo kangotoni lo tenya na lida obang Lobanga kode ibuha to cio. -======= -\c 18 \v 1 Oto Yesu orihohi jayona kunenge kitisirani lo rihohino icieng jimitan ojir ilifati ida oniemaha. \v 2 Oto ojo, “Iyo lobo kang afa, ongon lobo kangotoni lo tenya na lida obang Lobanga kode ibuha to cio ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 18 \v 1 Oto Yesu orihohi jayona kunenge kitisirani lo rihohino icieng jimitan ojir ilifati ida oniemaha. \v 2 Oto ojo, “Iyo lobo kang afa, ongon lobo kangotoni lo tenya na lida obang Lobanga kode ibuha to cio. \ No newline at end of file diff --git a/manifest.json b/manifest.json index e0e0700..44c9a0e 100644 --- a/manifest.json +++ b/manifest.json @@ -220,7 +220,13 @@ "17-09", "17-20", "17-22", + "17-28", + "17-30", + "17-32", + "17-34", + "17-37", "18-title", + "18-01", "18-03", "18-06", "18-09",