diff --git a/24/25.txt b/24/25.txt index c1dab24..2be2a89 100644 --- a/24/25.txt +++ b/24/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Ojo inyi diho icieng, “idataruha ite manyu ikaruha kiniang tenya lafa loteny kamocak! \v 26 Ida orumu kristo ojir orumu kidak lo kuno sangite fad orutorore iyo deyo nenge?” \v 27 Icak inyi many to Moses ko kamocak fad ititimahi icieng tohi na lorumu igeri ojir itiihino diho inyi. -======= -\v 25 Ojo inyi diho icieng, “idataruha ite manyu ikaruha kiniang tenya lafa loteny kamocak! \v 26 Ida orumu kristo ojir orumu kidak lo kuno sangite fad orutorore iyo deyo nenge?” \v 27 Icak inyi many to Moses ko kamocak fad ititimahi icieng tohi na lorumu igeri ojir itiihino diho inyi. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 25 Ojo inyi diho icieng, “idataruha ite manyu ikaruha kiniang tenya lafa loteny kamocak! \v 26 Ida orumu kristo ojir orumu kidak lo kuno sangite fad orutorore iyo deyo nenge?” \v 27 Icak inyi many to Moses ko kamocak fad ititimahi icieng tohi na lorumu igeri ojir itiihino diho inyi. \ No newline at end of file diff --git a/24/30.txt b/24/30.txt index 0882408..8234f7f 100644 --- a/24/30.txt +++ b/24/30.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 30 Langun litongohino inyi iyo meja ko icieng odumu inyi mugati ico kwama obeny icak kicwara icieng \v 31 konyeha kuneicieng ko ngaja icieng ko heruno inyi, inyi ko rijoro to konyeha kuneicieng. \v 32 Itifi icieng kenite ake ake ojo, “ ida adi taulo kuniyang ocura kalititima inyi diho ohoi to kikoi tenyi tenyi kuna ligero?'' -======= -\v 30 Langun litongohino inyi iyo meja ko icieng odumu inyi mugati ico kwama obeny icak kicwara icieng \v 31 konyeha kuneicieng ko ngaja icieng ko heruno inyi, inyi ko rijoro to konyeha kuneicieng. \v 32 Itifi icieng kenite ake ake ojo, “ ida adi taulo kuniyang ocura kalititima inyi diho ohoi to kikoi tenyi tenyi kuna ligero? ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 30 Langun litongohino inyi iyo meja ko icieng odumu inyi mugati ico kwama obeny icak kicwara icieng \v 31 konyeha kuneicieng ko ngaja icieng ko heruno inyi, inyi ko rijoro to konyeha kuneicieng. \v 32 Itifi icieng kenite ake ake ojo, “ ida adi taulo kuniyang ocura kalititima inyi diho ohoi to kikoi tenyi tenyi kuna ligero?'' \ No newline at end of file diff --git a/24/33.txt b/24/33.txt index c23d6a4..bec2ac0 100644 --- a/24/33.txt +++ b/24/33.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 33 Icieng ko wojunoti deu deu ko itoroti iya Jerusalem. Ofwo icieng orumahi kunu tomon ko lobito ko kuna longon ko icieng ifuroti lobito faji. \v 34 Manyu ojimi, “Ara dede!” Lowaru lahitok oboto diho Saimon. \v 35 kuna are ko kititimahino icieng tohi na litiihino kikoi ko koditi na loherunore icieng Yesu na tik lobenyare mugati. -======= -\v 33 Icieng ko wojunoti deu deu ko itoroti iya Jerusalem. Ofwo icieng orumahi kunu tomon ko lobito ko kuna longon ko icieng ifuroti lobito faji. \v 34 Manyu ojimi, “Ara dede!” Lowaru lahitok oboto diho Saimon. \v 35 kuna are ko kititimahino icieng tohi na litiihino kikoi ko koditi na loherunore icieng Yesu na tik lobenyare mugati. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 33 Icieng ko wojunoti deu deu ko itoroti iya Jerusalem. Ofwo icieng orumahi kunu tomon ko lobito ko kuna longon ko icieng ifuroti lobito faji. \v 34 Manyu ojimi, “Ara dede!” Lowaru lahitok oboto diho Saimon. \v 35 kuna are ko kititimahino icieng tohi na litiihino kikoi ko koditi na loherunore icieng Yesu na tik lobenyare mugati. \ No newline at end of file diff --git a/24/36.txt b/24/36.txt index fec288a..d0195c5 100644 --- a/24/36.txt +++ b/24/36.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 36 Kolorihe icieng otenya kuna, Yesu token ko woita kiji neicieng ko jimitan diho icieng, “kisiliban kingon ko ite!” \v 37 Oto icieng ko ryenya manyu obangiha iiyoti ojo kideya icieng okorif. -======= -\v 36 Kolorihe icieng otenya kuna, Yesu token ko woita kiji neicieng ko jimitan diho icieng, “kisiliban kingon ko ite!” \v 37 Oto icieng ko ryenya manyu obangiha iiyoti ojo kideya icieng okorif ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 36 Kolorihe icieng otenya kuna, Yesu token ko woita kiji neicieng ko jimitan diho icieng, “kisiliban kingon ko ite!” \v 37 Oto icieng ko ryenya manyu obangiha iiyoti ojo kideya icieng okorif. \ No newline at end of file diff --git a/24/38.txt b/24/38.txt index 813f58b..6d7fce8 100644 --- a/24/38.txt +++ b/24/38.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 38 Ojo inyi diho icieng, “Nyio iudo ite manyu nyio ikukuya ite to taulo? \v 39 Itide kac kunei ko kejuha kunei. Ara nan token ene. Kitir nan manyu ide ida okorif otehita ken ko koi iya na lideyare ite nan atehita”. \v 40 Langun ko lojo inyi ji, itotorohi icieng kac ko kejuha kunenge. -======= -\v 38 Ojo inyi diho icieng, “Nyio iudo ite manyu nyio ikukuya ite to taulo? \v 39 Itide kac kunei ko kejuha kunei. Ara nan token ene. Kitir nan manyu ide ida okorif otehita ken ko koi iya na lideyare ite nan atehita”. \v 40 Langun ko lojo inyi ji, itotorohi icieng kac ko kejuha kunenge ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 38 Ojo inyi diho icieng, “Nyio iudo ite manyu nyio ikukuya ite to taulo? \v 39 Itide kac kunei ko kejuha kunei. Ara nan token ene. Kitir nan manyu ide ida okorif otehita ken ko koi iya na lideyare ite nan atehita”. \v 40 Langun ko lojo inyi ji, itotorohi icieng kac ko kejuha kunenge. \ No newline at end of file diff --git a/24/41.txt b/24/41.txt index a54bff0..6a603ef 100644 --- a/24/41.txt +++ b/24/41.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 41 Manyu orihe icieng ida iruk to bolojun lo kwama ko kipany, itifi inyi icieng ojo, “Ingon haba ite ko lobo tohi lo daha ene?” \v 42 Icori inyi angati lo kayamiti na itohoro \v 43 inyi ko kilifuno ko daha to ketemoni neicieng.'' -======= -\v 41 Manyu orihe icieng ida iruk to bolojun lo kwama ko kipany, itifi inyi icieng ojo, “Ingon haba ite ko lobo tohi lo daha ene?” \v 42 Icori inyi angati lo kayamiti na itohoro \v 43 inyi ko kilifuno ko daha to ketemoni neicieng ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 41 Manyu orihe icieng ida iruk to bolojun lo kwama ko kipany, itifi inyi icieng ojo, “Ingon haba ite ko lobo tohi lo daha ene?” \v 42 Icori inyi angati lo kayamiti na itohoro \v 43 inyi ko kilifuno ko daha to ketemoni neicieng. \ No newline at end of file diff --git a/24/48.txt b/24/48.txt index 736eb30..ad20652 100644 --- a/24/48.txt +++ b/24/48.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 48 Ite lira sadeni kulo kuno sangite. \v 49 Aloro nan culahino ite tohi na locik Apa nei ati itongoti Jerusalem many kolohiticiefi ite golun to kai”. -======= -\v 48 Ite lira sadeni kulo kuno sangite. \v 49 Aloro nan culahino ite tohi na locik Apa nei ati itongoti Jerusalem many kolohiticiefi ite golun to kai”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 48 Ite lira sadeni kulo kuno sangite. \v 49 Aloro nan culahino ite tohi na locik Apa nei ati itongoti Jerusalem many kolohiticiefi ite golun to kai”. \ No newline at end of file diff --git a/manifest.json b/manifest.json index f15d6d4..ae32d29 100644 --- a/manifest.json +++ b/manifest.json @@ -541,9 +541,17 @@ "24-17", "24-19", "24-21", + "24-22", + "24-25", "24-28", + "24-30", + "24-33", + "24-36", + "24-38", + "24-41", "24-44", "24-45", + "24-48", "24-50", "24-52" ]