diff --git a/18/40.txt b/18/40.txt index 714a326..7d8b812 100644 --- a/18/40.txt +++ b/18/40.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 40 Yesu ko woita, ko rihohino cio ojo ojir iyauni na tungani diho inyi. ojo inyi lonyihu diho Yesu itifi inyi ojo, \v 41 “iwak isi nan atii nyio diho isi?” Inyiahahi inyi ojo, “Lahitok awak nan deya” -======= -\v 40 Yesu ko woita, ko rihohino cio ojo ojir iyauni na tungani diho inyi. ojo inyi lonyihu diho Yesu itifi inyi ojo, \v 41 “iwak isi nan atii nyio diho isi?” Inyiahahi inyi ojo, “Lahitok awak nan deya” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 40 Yesu ko woita, ko rihohino cio ojo ojir iyauni na tungani diho inyi. ojo inyi lonyihu diho Yesu itifi inyi ojo, \v 41 “iwak isi nan atii nyio diho isi?” Inyiahahi inyi ojo, “Lahitok awak nan deya” \ No newline at end of file diff --git a/19/01.txt b/19/01.txt index eb2f28f..9d86a77 100644 --- a/19/01.txt +++ b/19/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 19 \v 1 Orute Yesu Jeriko orumu ongon ringaru. \v 2 Ongon tungani lobo ija na lobara Zakaio, ara inyi lahitok lo katisofok kulo mocoro manyu obara noo. -======= -\c 19 \v 1 Orute Yesu Jeriko orumu ongon ringaru. \v 2 Ongon tungani lobo ija na lobara Zakaio, ara inyi lahitok lo katisofok kulo mocoro manyu obara noo ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 19 \v 1 Orute Yesu Jeriko orumu ongon ringaru. \v 2 Ongon tungani lobo ija na lobara Zakaio, ara inyi lahitok lo katisofok kulo mocoro manyu obara noo. \ No newline at end of file diff --git a/19/03.txt b/19/03.txt index 6389eeb..141611b 100644 --- a/19/03.txt +++ b/19/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Owak orumu inyi yenun Yesu inyi ngai, ati to suhon nenge, itilanyu ilulung inyi. \v 4 Oto inyi ife ketemoni olo irwok ciani bule ojir adeunore Yesu tonyio orumu olotuno Yesu ara fotiri lona bule. -======= -\v 3 Owak orumu inyi yenun Yesu inyi ngai, ati to suhon nenge, itilanyu ilulung inyi. \v 4 Oto inyi ife ketemoni olo irwok ciani bule ojir adeunore Yesu tonyio orumu olotuno Yesu ara fotiri lona bule ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 3 Owak orumu inyi yenun Yesu inyi ngai, ati to suhon nenge, itilanyu ilulung inyi. \v 4 Oto inyi ife ketemoni olo irwok ciani bule ojir adeunore Yesu tonyio orumu olotuno Yesu ara fotiri lona bule \ No newline at end of file diff --git a/19/05.txt b/19/05.txt index 131f27e..3652fc9 100644 --- a/19/05.txt +++ b/19/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Kolo goru Yesu na faji ko deya kai ko jimitan diho inyi, Zakaio iculuno kof deu, aloro nan kitongo kaji nino ene far. \v 6 Oto inyi iculuno deu deu ko kifotuno Yesu kaji nenge to kwerun lo tau. \v 7 Odeu cio fad icahi ngungunita ojo, “lolo inyi ara weloni kaji lo kapalani.” -======= -\v 5 Kolo goru Yesu na faji ko deya kai ko jimitan diho inyi, Zakaio iculuno kof deu, aloro nan kitongo kaji nino ene far. \v 6 Oto inyi iculuno deu deu ko kifotuno Yesu kaji nenge to kwerun lo tau. \v 7 Odeu cio fad icahi ngungunita ojo, “lolo inyi ara weloni kaji lo kapalani” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 5 Kolo goru Yesu na faji ko deya kai ko jimitan diho inyi, Zakaio iculuno kof deu, aloro nan kitongo kaji nino ene far. \v 6 Oto inyi iculuno deu deu ko kifotuno Yesu kaji nenge to kwerun lo tau. \v 7 Odeu cio fad icahi ngungunita ojo, “lolo inyi ara weloni kaji lo kapalani” \ No newline at end of file diff --git a/19/08.txt b/19/08.txt index 6076279..a84f88e 100644 --- a/19/08.txt +++ b/19/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Ati owoju Zakaio ko jimitan diho Lahitok, “tode Lahitok jija acio ca nan nusu lo sangite kunei diho kakidahak, manyu kalatimumun afa nan tungani iyo lobo tohi, anyahahi ca nan kakeny ongon. \v 9 Ojo Yesu diho inyi, “ene far lolotu lwaharu ene kaji, tonyio ara manyu ene tungani lo tata lo Abraham. \v 10 Tonyio olotu kito lo tungani tahita ko lwaha kuna lorii”. -======= -\v 8 Ati owoju Zakaio ko jimitan diho Lahitok, “tode Lahitok jija acio ca nan nusu lo sangite kunei diho kakidahak, manyu kalatimumun afa nan tungani iyo lobo tohi, anyahahi ca nan kakeny ongon. \v 9 Ojo Yesu diho inyi, “ene far lolotu lwaharu ene kaji, tonyio ara manyu ene tungani lo tata lo Abraham. \v 10 Tonyio olotu kito lo tungani tahita ko lwaha kuna lorii”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 8 Ati owoju Zakaio ko jimitan diho Lahitok, “tode Lahitok jija acio ca nan nusu lo sangite kunei diho kakidahak, manyu kalatimumun afa nan tungani iyo lobo tohi, anyahahi ca nan kakeny ongon. \v 9 Ojo Yesu diho inyi, “ene far lolotu lwaharu ene kaji, tonyio ara manyu ene tungani lo tata lo Abraham. \v 10 Tonyio olotu kito lo tungani tahita ko lwaha kuna lorii”. \ No newline at end of file diff --git a/19/11.txt b/19/11.txt index 8595f9a..2f761f6 100644 --- a/19/11.txt +++ b/19/11.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD -\v 11 Kolorihe oningoti ene, osodoro inyi foro kitisirani lobo diho icieng tonyio orumu inyi lonyiharu Jerusalem manyu ibuha cio ojo loloro ca okabwe lo Lobanga boto tarany. \v 12 Ojo inyi, “lobo tungani kaboloroni afa ko loro lobo kof iloma ojir ofihi inyi ara kabu aitu hati. -======= \v 11 Kolorihe oningoti ene, osodoro inyi foro kitisirani lobo diho icieng tonyio orumu inyi lonyiharu Jerusalem manyu ibuha cio ojo loloro ca okabwe lo Lobanga boto tarany. \v 12 Ojo inyi, “lobo tungani -kaboloroni afa ko loro lobo kof iloma ojir ofihi inyi ara kabu aitu hati. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +kaboloroni afa ko loro lobo kof iloma ojir ofihi inyi ara kabu aitu hati. \ No newline at end of file diff --git a/19/13.txt b/19/13.txt index 2f2fe76..a5be85e 100644 --- a/19/13.txt +++ b/19/13.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 13 Oto inyi ilolongu karwaak kunenge tomon ico icieng robia tomon ojo, ‘itiyoreti kuno robia tujar manyu alotu nan’, tenya na lorihohi inyi karwaak kunenge inyi na. \v 14 Ati orumu cio kulo kof nenge oberu inyi oculari cio omot nenge ojo ida ohoi kiwak ene tungani ara kabu niyang. \v 15 Ofwori ofihi lrok ara kabu, oitu kang. Inyi ko kilolonguno karwaak kunenge kuna ngole afa licio inyi robia lodeunore tohi na litii icieng to kuna robia. -======= -\v 13 Oto inyi ilolongu karwaak kunenge tomon ico icieng robia tomon ojo, ‘itiyoreti kuno robia tujar manyu alotu nan’, tenya na lorihohi inyi karwaak kunenge inyi na. \v 14 Ati orumu cio kulo kof nenge oberu inyi oculari cio omot nenge ojo ida ohoi kiwak ene tungani ara kabu niyang. \v 15 Ofwori ofihi lrok ara kabu, oitu kang. Inyi ko kilolonguno karwaak -kunenge kuna ngole afa licio inyi robia lodeunore tohi na litii icieng to kuna robia. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 13 Oto inyi ilolongu karwaak kunenge tomon ico icieng robia tomon ojo, ‘itiyoreti kuno robia tujar manyu alotu nan’, tenya na lorihohi inyi karwaak kunenge inyi na. \v 14 Ati orumu cio kulo kof nenge oberu inyi oculari cio omot nenge ojo ida ohoi kiwak ene tungani ara kabu niyang. \v 15 Ofwori ofihi lrok ara kabu, oitu kang. Inyi ko kilolonguno karwaak +kunenge kuna ngole afa licio inyi robia lodeunore tohi na litii icieng to kuna robia. \ No newline at end of file diff --git a/19/22.txt b/19/22.txt index 3e19326..d641ab7 100644 --- a/19/22.txt +++ b/19/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Inyiahahi Lahitok nenge ojo, ‘Ahingotohi nan isi tenya to tenyi tenyi kulo kutuk nino, isi ene karwaani ikaru irohoi, iyen isi kode jimitan ogol koditi nei, adumarita nan tohi na lida nan afik, manyu adengo faji na lida nan aiihi kinyemo? \v 23 Nyio hati afa lohitik isi fiha robiati nei benge ojir ngole ajo nan alotu arumu loborengi? -======= -\v 22 Inyiahahi Lahitok nenge ojo, ‘Ahingotohi nan isi tenya to tenyi tenyi kulo kutuk nino, isi ene karwaani ikaru irohoi, iyen isi kode jimitan ogol koditi nei, adumarita nan tohi na lida nan afik, manyu adengo faji na lida nan aiihi kinyemo? \v 23 Nyio hati afa lohitik isi fiha robiati nei benge ojir ngole ajo nan alotu arumu loborengi? ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 22 Inyiahahi Lahitok nenge ojo, ‘Ahingotohi nan isi tenya to tenyi tenyi kulo kutuk nino, isi ene karwaani ikaru irohoi, iyen isi kode jimitan ogol koditi nei, adumarita nan tohi na lida nan afik, manyu adengo faji na lida nan aiihi kinyemo? \v 23 Nyio hati afa lohitik isi fiha robiati nei benge ojir ngole ajo nan alotu arumu loborengi? \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2885c8e..d2219ac 100644 --- a/manifest.json +++ b/manifest.json @@ -228,9 +228,16 @@ "18-35", "18-42", "19-title", + "19-01", + "19-03", + "19-05", + "19-08", + "19-11", + "19-13", "19-16", "19-18", "19-20", + "19-22", "19-24", "19-26", "19-28",