diff --git a/21/16.txt b/21/16.txt index 660c4d0..ae719da 100644 --- a/21/16.txt +++ b/21/16.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 16 Kitob ca ko katomonok, recera, kajeba ko morot ite manyu kude tokiji ningi ifadari ca. \v 17 Cio fad kiberu mute ite to nan. \v 18 Ati kileng fofiti lo kweci kuningi ida ca ori. \v 19 To woita to golun irumu ca ite warun. -======= -\v 16 Kitob ca ko katomonok, recera, kajeba ko morot ite manyu kude tokiji ningi ifadari ca. \v 17 Cio fad kiberu mute ite to nan. \v 18 Ati kileng fofiti lo kweci kuningi ida ca ori. \v 19 To woita to golun irumu -ca ite warun. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 16 Kitob ca ko katomonok, recera, kajeba ko morot ite manyu kude tokiji ningi ifadari ca. \v 17 Cio fad kiberu mute ite to nan. \v 18 Ati kileng fofiti lo kweci kuningi ida ca ori. \v 19 To woita to golun irumu ca ite warun. \ No newline at end of file diff --git a/21/20.txt b/21/20.txt index 34dd25c..f8bb53e 100644 --- a/21/20.txt +++ b/21/20.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 20 Kalideu ite karemok lirit Jerusalem, itiyen jimitan lonyiha kisararu nenge. \v 21 Dong ingohi kuna longon Judea ife iya dongeco, ingohi kuna longon Jerusalem torutu, keco kuna longon oleng orute Jerusalem. \v 22 Tonyio ara kuno faritin kulo kidak lo kitifuta kigero kulafa ligeri fad. -======= -\v 20 Kalideu ite karemok lirit Jerusalem, itiyen jimitan lonyiha kisararu nenge. \v 21 Dong ingohi kuna longon -Judea ife iya dongeco, ingohi kuna longon Jerusalem torutu, keco kuna longon oleng orute Jerusalem. \v 22 Tonyio ara kuno faritin kulo kidak lo kitifuta kigero kulafa ligeri fad. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 20 Kalideu ite karemok lirit Jerusalem, itiyen jimitan lonyiha kisararu nenge. \v 21 Dong ingohi kuna longon Judea ife iya dongeco, ingohi kuna longon Jerusalem torutu, keco kuna longon oleng orute Jerusalem. \v 22 Tonyio ara kuno faritin kulo kidak lo kitifuta kigero kulafa ligeri fad. \ No newline at end of file diff --git a/21/23.txt b/21/23.txt index 718e539..cfb9361 100644 --- a/21/23.txt +++ b/21/23.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 23 Bolojun ha re lo kidak lo kuna faritin diho ngorwo kafongak ko katinahak! Obolo ca kidak ene kof fad ko kilongo lo Lobanga diho kuno cio. \v 24 Ifadi ca icieng to latubot manyu iniefari ara mabusi kofi kofi fad. Onyion ca misiok Jerusalem manyu otumohino faritin kulo misiok. -======= -\v 23 Bolojun ha re lo kidak lo kuna faritin diho ngorwo kafongak ko katinahak! Obolo ca kidak ene kof fad ko kilongo lo Lobanga diho kuno cio. \v 24 Ifadi ca icieng to latubot manyu iniefari ara mabusi kofi kofi fad. Onyion ca misiok Jerusalem manyu -otumohino faritin kulo misiok. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 23 Bolojun ha re lo kidak lo kuna faritin diho ngorwo kafongak ko katinahak! Obolo ca kidak ene kof fad ko kilongo lo Lobanga diho kuno cio. \v 24 Ifadi ca icieng to latubot manyu iniefari ara mabusi kofi kofi fad. Onyion ca misiok Jerusalem manyu otumohino faritin kulo misiok. \ No newline at end of file diff --git a/21/34.txt b/21/34.txt index a125d69..c4a5470 100644 --- a/21/34.txt +++ b/21/34.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 34 Itigeny, kode keco taulo kuningi ogoli, ruma ko kiudo lo warun, oto cia nu far kimuhi ite iya kitu. \v 35 Tonyio olotuno na far to cio pili kuna longoni ene kof. -======= -\v 34 Itigeny, kode keco taulo kuningi ogoli, ruma ko kiudo lo warun, oto cia nu far kimuhi ite iya kitu. -\v 35 Tonyio olotuno na far to cio pili kuna longoni ene kof. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 34 Itigeny, kode keco taulo kuningi ogoli, ruma ko kiudo lo warun, oto cia nu far kimuhi ite iya kitu. \v 35 Tonyio olotuno na far to cio pili kuna longoni ene kof. \ No newline at end of file diff --git a/21/36.txt b/21/36.txt index d6bf3f4..5d81fcf 100644 --- a/21/36.txt +++ b/21/36.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 36 Itongoti iriria faritin fad manyu ilifa ojir ifur iyo sangite pili kuna mute lofwonu kitiihino manyu ojir mute itum woita ketemoni lo kito lo tungani” -======= \v 36 Itongoti iriria faritin fad manyu ilifa ojir ifur iyo -sangite pili kuna mute lofwonu kitiihino manyu ojir mute itum woita ketemoni lo kito lo tungani”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +sangite pili kuna mute lofwonu kitiihino manyu ojir mute itum woita ketemoni lo kito lo tungani”. \ No newline at end of file diff --git a/22/01.txt b/22/01.txt index ff17f98..2f91d77 100644 --- a/22/01.txt +++ b/22/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 22 \v 1 Orumu lonyihu far lo mugatihin kuna lida ikukumati to ibula na lilolongoti ojo far lo Rangaru (Paska) \v 2 manyu kadwarak kuna hitoha ko katiyenak kulo cik orumu otahitati kikoi lo kiniefuno ko kifadaru Yesu tonyio obang icieng cio. -======= -\c 22 \v 1 Orumu lonyihu far lo mugatihin kuna lida ikukumati to ibula na lilolongoti ojo far lo Rangaru (Paska) \v 2 manyu kadwarak kuna hitoha ko katiyenak kulo cik orumu otahitati kikoi lo kiniefuno ko kifadaru Yesu tonyio obang icieng cio ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 22 \v 1 Orumu lonyihu far lo mugatihin kuna lida ikukumati to ibula na lilolongoti ojo far lo Rangaru (Paska) \v 2 manyu kadwarak kuna hitoha ko katiyenak kulo cik orumu otahitati kikoi lo kiniefuno ko kifadaru Yesu tonyio obang icieng cio. \ No newline at end of file diff --git a/22/07.txt b/22/07.txt index a5a899d..cf037d3 100644 --- a/22/07.txt +++ b/22/07.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 7 Oto olotu far lo mugati kuna lida ikukumi to ibula far na longotorihin kirieho kulo Paska. \v 8 Ocule Yesu Petero ko Jon ocik icieng ojo, “ifwo ikukumahiti diho ohoi faji lodahare karama lo Paska”. \v 9 Itifi icieng ojo, “Aji ngohikukumahinore ohoi karama?” -======= -\v 7 Oto olotu far lo mugati kuna lida ikukumi to ibula far na longotorihin kirieho kulo Paska. \v 8 Ocule Yesu -Petero ko Jon ocik icieng ojo, “ifwo ikukumahiti diho ohoi faji lodahare karama lo Paska”. \v 9 Itifi icieng ojo, “Aji ngohikukumahinore ohoi karama?” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 7 Oto olotu far lo mugati kuna lida ikukumi to ibula far na longotorihin kirieho kulo Paska. \v 8 Ocule Yesu Petero ko Jon ocik icieng ojo, “ifwo ikukumahiti diho ohoi faji lodahare karama lo Paska”. \v 9 Itifi icieng ojo, “Aji ngohikukumahinore ohoi karama?” \ No newline at end of file diff --git a/22/10.txt b/22/10.txt index 866ca85..d3345ff 100644 --- a/22/10.txt +++ b/22/10.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 10 inyiahahi inyi ojo, “kalirutoro ite Jerusalem kitiric ca tungani na liyuhita moti lo kifi ite. Ijifata inyi many kaji na lorute inyi. \v 11 Ito hati ijo diho monye lo kaji, ‘ojo katiyenani aji faji na ngadahare nan karama ko jayona kunitole?’ -======= -\v 10 inyiahahi inyi ojo, “kalirutoro ite Jerusalem kitiric ca tungani na liyuhita moti lo kifi ite. Ijifata inyi many kaji na lorute inyi. \v 11 Ito hati ijo diho monye lo kaji, ‘ojo -katiyenani aji faji na ngadahare nan karama ko jayona kunitole?’ ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 10 inyiahahi inyi ojo, “kalirutoro ite Jerusalem kitiric ca tungani na liyuhita moti lo kifi ite. Ijifata inyi many kaji na lorute inyi. \v 11 Ito hati ijo diho monye lo kaji, ‘ojo katiyenani aji faji na ngadahare nan karama ko jayona kunitole?’'' \ No newline at end of file diff --git a/22/12.txt b/22/12.txt index 843b2ec..cca8cb4 100644 --- a/22/12.txt +++ b/22/12.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 12 Kitotorohi ca ite kaji lo kai na ilalat na lotuba ikukumahino, ikukumahiti karama ija”. \v 13 Ofwo icieng orumu sangite fad iya na lotenyare Yesu. Oto icieng ko kikukuma karama lo Paska. -======= -\v 12 Kitotorohi ca ite kaji lo kai na ilalat na lotuba ikukumahino, ikukumahiti karama ija”. \v 13 Ofwo icieng orumu sangite fad iya na lotenyare Yesu. -Oto icieng ko kikukuma karama lo Paska ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 12 Kitotorohi ca ite kaji lo kai na ilalat na lotuba ikukumahino, ikukumahiti karama ija”. \v 13 Ofwo icieng orumu sangite fad iya na lotenyare Yesu. Oto icieng ko kikukuma karama lo Paska. \ No newline at end of file diff --git a/22/17.txt b/22/17.txt index 1fb0728..67ec22b 100644 --- a/22/17.txt +++ b/22/17.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 17 Langun lodumu kubaya, icio kwama ko jimitan, “Ikai ene itikor ite fad. \v 18 Tonyio ahirihohi ite ida ca nan arihe amat vino ari many kololotu okabwe lo Lobanga”. -======= -\v 17 Langun lodumu kubaya, icio kwama ko jimitan, “Ikai ene itikor ite fad. \v 18 Tonyio ahirihohi ite ida ca -nan arihe amat vino ari many kololotu okabwe lo Lobanga”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 17 Langun lodumu kubaya, icio kwama ko jimitan, “Ikai ene itikor ite fad. \v 18 Tonyio ahirihohi ite ida ca nan arihe amat vino ari many kololotu okabwe lo Lobanga”. \ No newline at end of file diff --git a/22/19.txt b/22/19.txt index 459c552..43b6b6f 100644 --- a/22/19.txt +++ b/22/19.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 19 Odumu mugati icio kwama ko benya, ko kicwara icieng ojo, “ken nei ene na licori to ite; itiyoto jii kiiunitare nan”. \v 20 To na kikoi bito koloru daha, odumu kubaya ojo, “Ara ene kubaya cik ngejuk to okoto nei na lijuhori to ite. -======= -\v 19 Odumu mugati icio kwama ko benya, ko kicwara icieng ojo, “ken nei ene na licori to ite; itiyoto jii kiiunitare nan”. \v 20 To na kikoi bito koloru daha, -odumu kubaya ojo, “Ara ene kubaya cik ngejuk to okoto nei na lijuhori to ite ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 19 Odumu mugati icio kwama ko benya, ko kicwara icieng ojo, “ken nei ene na licori to ite; itiyoto jii kiiunitare nan”. \v 20 To na kikoi bito koloru daha, odumu kubaya ojo, “Ara ene kubaya cik ngejuk to okoto nei na lijuhori to ite. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8fe4b83..fbe9d86 100644 --- a/manifest.json +++ b/manifest.json @@ -461,15 +461,27 @@ "21-07", "21-10", "21-12", + "21-14", + "21-16", + "21-20", + "21-23", "21-25", "21-27", "21-29", "21-32", + "21-34", + "21-36", "21-37", "22-title", + "22-01", "22-03", "22-05", + "22-07", + "22-10", + "22-12", "22-14", + "22-17", + "22-19", "22-21", "22-31", "22-33",