From b2cc7718913c29eb9444145133e2ab27fee74267 Mon Sep 17 00:00:00 2001 From: klero Date: Wed, 2 Nov 2022 14:28:25 +0200 Subject: [PATCH] Wed Nov 02 2022 14:28:25 GMT+0200 (Central Africa Time) --- 06/46.txt | 7 +------ 07/01.txt | 6 +----- 07/06.txt | 7 +------ 07/09.txt | 6 +----- 07/16.txt | 7 +------ 07/18.txt | 6 +----- 07/24.txt | 6 +----- 07/27.txt | 7 +------ 07/29.txt | 6 +----- manifest.json | 9 +++++++++ 10 files changed, 18 insertions(+), 49 deletions(-) diff --git a/06/46.txt b/06/46.txt index 62e9a3b..835a06a 100644 --- a/06/46.txt +++ b/06/46.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 46 Nyio ilolongo ite nan ijo Lahitok, Lahitok ati ida iwak kitiyo tohi na lajo nan. \v 47 Ahitotorohi ca koditi lo tungani na lolotu diho nan, oning tenyi tenyi kunei ofihahi tic. \v 48 Ori inyi iya tungani na loduho kaji, oto obok iluko lo fiha fotiri lo guri nenge iyo tabak. Kalitihu kare itang kifi na kaji ati ida itinienieng na kaji tonyio oduho otoc. -======= -\v 46 Nyio ilolongo ite nan ijo Lahitok, Lahitok ati ida iwak kitiyo tohi na lajo nan. \v 47 Ahitotorohi ca koditi lo tungani na lolotu diho nan, oning tenyi tenyi kunei ofihahi tic. \v 48 Ori inyi iya tungani na loduho kaji, oto -obok iluko lo fiha fotiri lo guri nenge iyo tabak. Kalitihu kare itang kifi na kaji ati ida itinienieng na kaji tonyio oduho otoc. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 46 Nyio ilolongo ite nan ijo Lahitok, Lahitok ati ida iwak kitiyo tohi na lajo nan. \v 47 Ahitotorohi ca koditi lo tungani na lolotu diho nan, oning tenyi tenyi kunei ofihahi tic. \v 48 Ori inyi iya tungani na loduho kaji, oto obok iluko lo fiha fotiri lo guri nenge iyo tabak. Kalitihu kare itang kifi na kaji ati ida itinienieng na kaji tonyio oduho otoc. \ No newline at end of file diff --git a/07/01.txt b/07/01.txt index 6ee71ca..c15fdae 100644 --- a/07/01.txt +++ b/07/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 7 \v 1 Langun lokerihi Yesu tenya kuno tenyi tenyi fad oning cio, orute inyi kapernaum.. -======= -\c 7 \v 1 Langun lokerihi Yesu tenya kuno tenyi tenyi fad oning cio, orute inyi kapernaum. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 7 \v 1 Langun lokerihi Yesu tenya kuno tenyi tenyi fad oning cio, orute inyi kapernaum. \ No newline at end of file diff --git a/07/06.txt b/07/06.txt index 6580eb6..cc2dcc1 100644 --- a/07/06.txt +++ b/07/06.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 6 Tinya Yesu ko kiliharu ko icieng. Orumu inyi lonyiharu kaji, oculu na asegere morot kunenge kitirico inyi ojo diho inyi, “Lahitok ketigena ken, ida nan acam to isi rutuno kaji nei, \v 7 inyi lico nan manyu ake ake jimitan ida nan acam to lotuno diho isi. Ati torihu tenya oto ca karwaani nei ko jiran. \v 8 Tonyio nan token angon nan ko kuna lohilanyu nan, angon manyu ko asegeri kuna lalanyu nan. Arihohi nan ene ilo “olo orihohi nu ou” olotu. Ajo diho karwaani nei itiyo ene itii. -======= -\v 6 Tinya Yesu ko kiliharu ko icieng. Orumu inyi lonyiharu kaji, oculu na asegere morot kunenge kitirico inyi ojo diho inyi, “Lahitok ketigena ken, ida nan acam to isi rutuno kaji nei, \v 7 inyi lico nan manyu ake ake jimitan ida nan acam to lotuno diho isi. Ati torihu tenya oto ca karwaani nei ko jiran. \v 8 Tonyio nan token angon nan ko kuna lohilanyu nan, angon manyu ko asegeri kuna lalanyu nan. Arihohi nan ene ilo “olo orihohi nu ou” olotu. Ajo diho karwaani -nei itiyo ene itii. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 6 Tinya Yesu ko kiliharu ko icieng. Orumu inyi lonyiharu kaji, oculu na asegere morot kunenge kitirico inyi ojo diho inyi, “Lahitok ketigena ken, ida nan acam to isi rutuno kaji nei, \v 7 inyi lico nan manyu ake ake jimitan ida nan acam to lotuno diho isi. Ati torihu tenya oto ca karwaani nei ko jiran. \v 8 Tonyio nan token angon nan ko kuna lohilanyu nan, angon manyu ko asegeri kuna lalanyu nan. Arihohi nan ene ilo “olo orihohi nu ou” olotu. Ajo diho karwaani nei itiyo ene itii. \ No newline at end of file diff --git a/07/09.txt b/07/09.txt index c5350e1..e499d0d 100644 --- a/07/09.txt +++ b/07/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Koloning Yesu ene tenya, ipany bebe tona asegere. Gaolo diho ilulung kuna lijifita inyi, oto ojo, “ahirihohi ite ida nan larumu koditi lo kiruk na ibolo iya ene kileng to Isirael”. \v 10 kuna cio lo culuni ko itoro kaji orumahi nu karwaani lo na lahitok lofurie. -======= -\v 9 Koloning Yesu ene tenya, ipany bebe tona asegere. Gaolo diho ilulung kuna lijifita inyi, oto ojo, “ahirihohi ite ida nan larumu koditi lo kiruk na ibolo iya ene kileng to Isirael”. \v 10 kuna cio lo culuni ko itoro kaji orumahi nu karwaani lo na lahitok lofurie ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 9 Koloning Yesu ene tenya, ipany bebe tona asegere. Gaolo diho ilulung kuna lijifita inyi, oto ojo, “ahirihohi ite ida nan larumu koditi lo kiruk na ibolo iya ene kileng to Isirael”. \v 10 kuna cio lo culuni ko itoro kaji orumahi nu karwaani lo na lahitok lofurie. \ No newline at end of file diff --git a/07/16.txt b/07/16.txt index 7ce72f1..531ac68 100644 --- a/07/16.txt +++ b/07/16.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 16 Ifuti icieng fad ko kipany manyu omaji Lobanga ojo, “loboto kamocani lahitok kiji niyang, lolotu Lobanga lwaha cio kunenge”. \v 17 Ene layomit lo Yesu ko kisarahino Judaia ko kofikofi fad. -======= -\v 16 Ifuti icieng fad ko kipany manyu omaji Lobanga -ojo, “loboto kamocani lahitok kiji niyang, lolotu Lobanga lwaha cio kunenge”. \v 17 Ene layomit lo Yesu ko kisarahino Judaia ko kofikofi fad. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 16 Ifuti icieng fad ko kipany manyu omaji Lobanga ojo, “loboto kamocani lahitok kiji niyang, lolotu Lobanga lwaha cio kunenge”. \v 17 Ene layomit lo Yesu ko kisarahino Judaia ko kofikofi fad. \ No newline at end of file diff --git a/07/18.txt b/07/18.txt index 074361f..492c1e0 100644 --- a/07/18.txt +++ b/07/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Orihohi kalihitak kulo inyi kuno tenyi tenyi fad. Ilolongu inyi icieng are, \v 19 ocule icieng diho Yesu kitifia ojo itifiata itijo, “isi re lafa lojimi olotuno kode ojir ohoi kidodomo lobo ake?” \v 20 Kologoru kuna cio diho Yesu, oto ojimi diho inyi, “kiculu Jon kabatisani ohoi diho isi kitifia jimitan, Isi re lafa lojimi ilotuno kode ojir ohoi kikodomo lobo tungani ake?” -======= -\v 18 Orihohi kalihitak kulo inyi kuno tenyi tenyi fad. Ilolongu inyi icieng are, \v 19 ocule icieng diho Yesu kitifia ojo itifiata itijo, “isi re lafa lojimi olotuno kode ojir ohoi kidodomo lobo ake?” \v 20 Kologoru kuna cio diho Yesu, oto ojimi diho inyi, “kiculu Jon kabatisani ohoi diho isi kitifia jimitan, Isi re lafa lojimi ilotuno kode ojir ohoi kikodomo lobo tungani ake?” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 18 Orihohi kalihitak kulo inyi kuno tenyi tenyi fad. Ilolongu inyi icieng are, \v 19 ocule icieng diho Yesu kitifia ojo itifiata itijo, “isi re lafa lojimi olotuno kode ojir ohoi kidodomo lobo ake?” \v 20 Kologoru kuna cio diho Yesu, oto ojimi diho inyi, “kiculu Jon kabatisani ohoi diho isi kitifia jimitan, Isi re lafa lojimi ilotuno kode ojir ohoi kikodomo lobo tungani ake?” \ No newline at end of file diff --git a/07/24.txt b/07/24.txt index 7707e1a..8226757 100644 --- a/07/24.txt +++ b/07/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 langun lofwo ifahi kulo Jon, icak Yesu tenya diho ilulung tenya lo ken lo Jon. “Nyio afa ifwo ite deya to kuny? Gerecati na lokuta iyoma? \v 25 Kalida ara ji ifwo afa ite deya nyio? Tungani na licefita kyelani kuna idwaruha? Oru cio kuna licefita kyelani kulo wel manyu ongoniti ara naijir itongoti Jerusalem. \v 26 Ati nyio afa ifwo ite deya? Kamocani? Ibo ahirihohi ite, manyu na lilany kamocani. -======= -\v 24 langun lofwo ifahi kulo Jon, icak Yesu tenya diho ilulung tenya lo ken lo Jon. “Nyio afa ifwo ite deya to kuny? Gerecati na lokuta iyoma? \v 25 Kalida ara ji ifwo afa ite deya nyio? Tungani na licefita kyelani kuna idwaruha? Oru cio kuna licefita kyelani kulo wel manyu ongoniti ara naijir itongoti Jerusalem. \v 26 Ati nyio afa ifwo ite deya? Kamocani? Ibo ahirihohi ite, manyu na lilany kamocani. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 24 langun lofwo ifahi kulo Jon, icak Yesu tenya diho ilulung tenya lo ken lo Jon. “Nyio afa ifwo ite deya to kuny? Gerecati na lokuta iyoma? \v 25 Kalida ara ji ifwo afa ite deya nyio? Tungani na licefita kyelani kuna idwaruha? Oru cio kuna licefita kyelani kulo wel manyu ongoniti ara naijir itongoti Jerusalem. \v 26 Ati nyio afa ifwo ite deya? Kamocani? Ibo ahirihohi ite, manyu na lilany kamocani. \ No newline at end of file diff --git a/07/27.txt b/07/27.txt index 754a8b0..19530e5 100644 --- a/07/27.txt +++ b/07/27.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 27 inyi ene lafa ligerohini ojo, Acule ca nan ifak nei ketemoni Nino, Na ca likukum kikoi nino Ketemoni nino, \v 28 ahirihohi ite, tokiji lo kuna lotomonu ngorwo, oru lobo lobolo ilany Jon, oto hati, na lisidi to Okabue lo Lobanga obolo ilany inyi.'' -======= -\v 27 inyi ene lafa ligerohini ojo, Acule ca nan ifak nei ketemoni Nino, Na ca likukum kikoi nino -Ketemoni nino, \v 28 ahirihohi ite, tokiji lo kuna lotomonu ngorwo, oru lobo lobolo ilany Jon, oto hati, na lisidi to Okabue lo Lobanga obolo ilany inyi ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 27 inyi ene lafa ligerohini ojo, Acule ca nan ifak nei ketemoni Nino, Na ca likukum kikoi nino Ketemoni nino, \v 28 ahirihohi ite, tokiji lo kuna lotomonu ngorwo, oru lobo lobolo ilany Jon, oto hati, na lisidi to Okabue lo Lobanga obolo ilany inyi.'' \ No newline at end of file diff --git a/07/29.txt b/07/29.txt index 8ab62ea..c07bf1f 100644 --- a/07/29.txt +++ b/07/29.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 29 (cio fad kileng katisofok kulo mucoro koloningi tenya lo Yesu iniangiti jimitan obehi kikoi lo Lobanga tonyio libatis Jon icieng. \v 30 Ati Parisihin ko katiyenak kulo cik oberuni kikukuma lo Lobanga to icieng tonyio ida icieng iruk kibatisa lo Jon.) -======= -\v 29 (cio fad kileng katisofok kulo mucoro koloningi tenya lo Yesu iniangiti jimitan obehi kikoi lo Lobanga tonyio libatis Jon icieng. \v 30 Ati Parisihin ko katiyenak kulo cik oberuni kikukuma lo Lobanga to icieng tonyio ida icieng iruk kibatisa lo Jon) ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 29 (cio fad kileng katisofok kulo mucoro koloningi tenya lo Yesu iniangiti jimitan obehi kikoi lo Lobanga tonyio libatis Jon icieng. \v 30 Ati Parisihin ko katiyenak kulo cik oberuni kikukuma lo Lobanga to icieng tonyio ida icieng iruk kibatisa lo Jon.) \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4f899af..c1ebb97 100644 --- a/manifest.json +++ b/manifest.json @@ -164,17 +164,26 @@ "06-27", "06-29", "06-31", + "06-35", "06-37", "06-38", "06-39", "06-41", "06-43", "06-45", + "06-46", "06-49", "07-title", + "07-01", "07-02", + "07-06", + "07-09", "07-11", + "07-16", + "07-18", "07-21", + "07-24", + "07-27", "07-44", "08-title", "08-07",