From 4cccb61b50fa1f28fb2b34a8b6cd333710779643 Mon Sep 17 00:00:00 2001 From: klero Date: Wed, 2 Nov 2022 13:32:10 +0200 Subject: [PATCH] Wed Nov 02 2022 13:32:10 GMT+0200 (Central Africa Time) --- 16/22.txt | 6 +----- 17/01.txt | 8 ++------ 17/05.txt | 7 +------ 17/11.txt | 6 +----- 17/14.txt | 6 +----- 17/17.txt | 6 +----- manifest.json | 6 ++++++ 7 files changed, 13 insertions(+), 32 deletions(-) diff --git a/16/22.txt b/16/22.txt index 6e76623..c5b380b 100644 --- a/16/22.txt +++ b/16/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Olotu far lo wei lona kakidahani otinge malaikahin inyi ofihahini oryeha ko Abram, owei manyu kabarani onuhi. \v 23 Kimatare faji na longonore inyi iyo kidak. Oto ilom kai odeu Abraham oloma noo ko Lazaro orieha ko inyi. -======= -\v 22 Olotu far lo wei lona kakidahani otinge malaikahin inyi ofihahini oryeha ko Abram, owei manyu kabarani onuhi. \v 23 Kimatare faji na longonore inyi iyo kidak. Oto ilom kai odeu Abraham oloma noo ko Lazaro orieha ko inyi, ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 22 Olotu far lo wei lona kakidahani otinge malaikahin inyi ofihahini oryeha ko Abram, owei manyu kabarani onuhi. \v 23 Kimatare faji na longonore inyi iyo kidak. Oto ilom kai odeu Abraham oloma noo ko Lazaro orieha ko inyi, \ No newline at end of file diff --git a/17/01.txt b/17/01.txt index dfe6eac..1ddaf5f 100644 --- a/17/01.txt +++ b/17/01.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD -\c 17 \v 1 Ojo Yesu diho jayona kunenge, “sangite kuna licwara cio ourorita iyo kipal ofwonu ca ati ongon kidak diho tungani na lofwonu nitare icieng. \v 2 Ocam inyi kibiro hino nam ko moru na hito otora murut nenge ilany inyi kicwara kuno sidiha iya kuno ourohino iyo kipal. -======= \c 17 \v 1 Ojo Yesu diho jayona kunenge, “sangite kuna licwara cio ourorita iyo kipal ofwonu ca ati ongon -kidak diho tungani na lofwonu nitare icieng. \v 2 Ocam inyi kibiro hino nam ko moru na hito otora -murut nenge ilany inyi kicwara kuno sidiha iya kuno ourohino iyo kipal. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +kidak diho tungani na lofwonu nitare icieng. \v 2 Ocam inyi kibiro hino nam ko moru na hito otora +murut nenge ilany inyi kicwara kuno sidiha iya kuno ourohino iyo kipal. \ No newline at end of file diff --git a/17/05.txt b/17/05.txt index a36bcbb..dc8cc4d 100644 --- a/17/05.txt +++ b/17/05.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 5 Ojo jayona diho Lahitok, “tosod kiruk niyang”. \v 6 Inyiahahi ojo, “kalitehita ite kiruk kileng ngori iya kirejati lo karadali itum isi ijo iyo ene ciani, ‘to dutuno ilo itibulahino katwa lo nam otum kining isi’. -======= -\v 5 Ojo jayona diho Lahitok, “tosod kiruk niyang”. -\v 6 Inyiahahi ojo, “kalitehita ite kiruk kileng ngori iya kirejati lo karadali itum isi ijo iyo ene ciani, ‘to dutuno ilo itibulahino katwa lo nam otum kining isi’. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 5 Ojo jayona diho Lahitok, “tosod kiruk niyang”. \v 6 Inyiahahi ojo, “kalitehita ite kiruk kileng ngori iya kirejati lo karadali itum isi ijo iyo ene ciani, ‘to dutuno ilo itibulahino katwa lo nam otum kining isi’. \ No newline at end of file diff --git a/17/11.txt b/17/11.txt index f457384..22a9f43 100644 --- a/17/11.txt +++ b/17/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Dong kololoro Yesu iya Jerusalem, oto inyi ijif kikoi na litolita lokorare lo Samaria ko Galilea. \v 12 Kolonyiha inyi rutoro lobo kang, itiric cio tomon kuna lomwai talulu inyi. owoitati lolomaje \v 13 oto hati ilolongoti to ogoro na ikwat ojo, “Yesu lahitok icwara kisa kinief diho ohoi.” -======= -\v 11 Dong kololoro Yesu iya Jerusalem, oto inyi ijif kikoi na litolita lokorare lo Samaria ko Galilea. \v 12 Kolonyiha inyi rutoro lobo kang, itiric cio tomon kuna lomwai talulu inyi. owoitati lolomaje \v 13 oto hati ilolongoti to ogoro na ikwat ojo, “Yesu lahitok icwara kisa kinief diho ohoi!” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 11 Dong kololoro Yesu iya Jerusalem, oto inyi ijif kikoi na litolita lokorare lo Samaria ko Galilea. \v 12 Kolonyiha inyi rutoro lobo kang, itiric cio tomon kuna lomwai talulu inyi. owoitati lolomaje \v 13 oto hati ilolongoti to ogoro na ikwat ojo, “Yesu lahitok icwara kisa kinief diho ohoi!” \ No newline at end of file diff --git a/17/14.txt b/17/14.txt index ad51c05..77e0963 100644 --- a/17/14.txt +++ b/17/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Kolodeu icieng ko jimitan, “ifwo itotorohiti kenite diho kadwarak”. Ojo icieng ofworo, icieng ko nyujon. \v 15 Lobito to kiji neicieng deuno jimitan lajir inyi ji, ko ituno omaja Lobanga to ogoro na ikwat. \v 16 Olotu ko urohino kejuha kulo Yesu ko kwama inyi-ara manyu inyi Samariani. -======= -\v 14 Kolodeu icieng ko jimitan, “ifwo itotorohiti kenite diho kadwarak”. Ojo icieng ofworo, icieng ko nyujon. \v 15 Lobito to kiji neicieng deuno jimitan lajir inyi ji, ko ituno omaja Lobanga to ogoro na ikwat. \v 16 Olotu ko urohino kejuha kulo Yesu ko kwama inyi-ara manyu inyi Samariani. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 14 Kolodeu icieng ko jimitan, “ifwo itotorohiti kenite diho kadwarak”. Ojo icieng ofworo, icieng ko nyujon. \v 15 Lobito to kiji neicieng deuno jimitan lajir inyi ji, ko ituno omaja Lobanga to ogoro na ikwat. \v 16 Olotu ko urohino kejuha kulo Yesu ko kwama inyi-ara manyu inyi Samariani. \ No newline at end of file diff --git a/17/17.txt b/17/17.txt index 7282a55..99987ed 100644 --- a/17/17.txt +++ b/17/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Itifia Yesu ojo, “Ida adi kuno cio litinyujoro fad ara tomon? Aji ha ongoni kuna kude mietangon? \v 18 Oru lobo loitu maja ko kwama Lobanga ara ene misiohoni keken?” \v 19 Oto ko jimitan diho inyi, “towoju ilo lohitijir kiruk nino isi”. -======= -\v 17 Itifia Yesu ojo, “Ida adi kuno cio litinyujoro fad ara tomon? Aji ha ongoni kuna kude mietangon? \v 18 Oru lobo loitu maja ko kwama Lobanga ara ene misiohoni keken?” \v 19 Oto ko jimitan diho inyi, “towoju ilo lohitijir kiruk nino isi”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 17 Itifia Yesu ojo, “Ida adi kuno cio litinyujoro fad ara tomon? Aji ha ongoni kuna kude mietangon? \v 18 Oru lobo loitu maja ko kwama Lobanga ara ene misiohoni keken?” \v 19 Oto ko jimitan diho inyi, “towoju ilo lohitijir kiruk nino isi”. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 44c9a0e..b521dbb 100644 --- a/manifest.json +++ b/manifest.json @@ -215,11 +215,17 @@ "16-27", "16-29", "17-title", + "17-01", "17-03", + "17-05", "17-07", "17-09", + "17-11", + "17-14", + "17-17", "17-20", "17-22", + "17-25", "17-28", "17-30", "17-32",