diff --git a/20/29.txt b/20/29.txt index b01eef9..4b2ffd1 100644 --- a/20/29.txt +++ b/20/29.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 29 Ene ongon afa recera mietare. Oyem ketemoni ngorwani ati owei oru kito longerihi, \v 30 Lo are \v 31 manyu lo uni ojung inyi, inyi na kikoibito, kuna cio fad mietare oweiha oru kolobo kito. \v 32 To kifwongi owei manyu ngorwani, \v 33 Adi dong to kibuhuno mute ara mute inyi ngorwani lo ngai ati kuno cio fad mietare litong ko inyi?” -======= -\v 29 Ene ongon afa recera mietare. Oyem ketemoni ngorwani ati owei oru kito longerihi, \v 30 Lo are \v 31 manyu lo uni ojung inyi, inyi na kikoibito, kuna cio fad mietare oweiha oru kolobo kito. \v 32 To kifwongi owei manyu ngorwani, \v 33 Adi dong to kibuhuno mute ara mute inyi ngorwani lo ngai ati kuno cio fad mietare litong ko inyi?” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 29 Ene ongon afa recera mietare. Oyem ketemoni ngorwani ati owei oru kito longerihi, \v 30 Lo are \v 31 manyu lo uni ojung inyi, inyi na kikoibito, kuna cio fad mietare oweiha oru kolobo kito. \v 32 To kifwongi owei manyu ngorwani, \v 33 Adi dong to kibuhuno mute ara mute inyi ngorwani lo ngai ati kuno cio fad mietare litong ko inyi.” \ No newline at end of file diff --git a/20/34.txt b/20/34.txt index 35cea43..16a1f2c 100644 --- a/20/34.txt +++ b/20/34.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 34 Inyahahi Yesu ojo, “cio kulo ene kof loyema manyu itiyemati. \v 35 Ati kuna likeni manyu ocam to nu warun ko kibuhuno to kiji lo kaweyak, ida oyema kode itiyemi. \v 36 Manyu ida orihe owei tonyio ori icieng iya malaikahin, ara icieng tee kulo Lobanga tona lorahare icieng tee kulo kibuhuno. -======= -\v 34 Inyahahi Yesu ojo, “cio kulo ene kof loyema manyu itiyemati. \v 35 Ati kuna likeni manyu ocam to nu warun ko kibuhuno to kiji lo kaweyak, ida oyema kode itiyemi. \v 36 Manyu ida orihe owei tonyio ori icieng iya malaikahin, ara icieng tee kulo Lobanga tona lorahare icieng tee kulo kibuhuno ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 34 Inyahahi Yesu ojo, “cio kulo ene kof loyema manyu itiyemati. \v 35 Ati kuna likeni manyu ocam to nu warun ko kibuhuno to kiji lo kaweyak, ida oyema kode itiyemi. \v 36 Manyu ida orihe owei tonyio ori icieng iya malaikahin, ara icieng tee kulo Lobanga tona lorahare icieng tee kulo kibuhuno. \ No newline at end of file diff --git a/20/39.txt b/20/39.txt index 644d692..51c3646 100644 --- a/20/39.txt +++ b/20/39.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 39 Inyiahahi kude kulo katiyenak kulo cik ojo, ‘iteny isi otoc katiyenani’. \v 40 Ida dong lobo tungani inyahat kitifia inyi lobo kitifit. -======= -\v 39 Inyiahahi kude kulo katiyenak kulo cik ojo, ‘iteny -isi otoc katiyenani’. \v 40 Ida dong lobo tungani inyahat kitifia inyi lobo kitifit. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 39 Inyiahahi kude kulo katiyenak kulo cik ojo, ‘iteny isi otoc katiyenani’. \v 40 Ida dong lobo tungani inyahat kitifia inyi lobo kitifit. \ No newline at end of file diff --git a/20/41.txt b/20/41.txt index 8089643..3d6598a 100644 --- a/20/41.txt +++ b/20/41.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 41 Tinya ojo Yesu diho icieng, “Aja re ojimi ojo ara kristo kito lo David? \v 42 David token lotulu iyo buk lo woleco, \v 43 ‘ojo Lahitok diho Lahitok nei: Itongo to ngati lo iteten nei, manyu afik nan merok kunino ara seger lo kejuha kunino. \v 44 David ilolong inyi ojo Lahitok, aja hati manyu ara kito nenge?” -======= -\v 41 Tinya ojo Yesu diho icieng, “Aja re ojimi ojo ara kristo kito lo David? \v 42 David token lotulu iyo buk lo -woleco, \v 43 ‘ojo Lahitok diho Lahitok nei: Itongo to ngati lo iteten nei, manyu afik nan merok kunino ara -seger lo kejuha kunino. \v 44 David ilolong inyi ojo Lahitok, aja hati manyu ara kito nenge?” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 41 Tinya ojo Yesu diho icieng, “Aja re ojimi ojo ara kristo kito lo David? \v 42 David token lotulu iyo buk lo woleco, \v 43 ‘ojo Lahitok diho Lahitok nei: Itongo to ngati lo iteten nei, manyu afik nan merok kunino ara seger lo kejuha kunino. \v 44 David ilolong inyi ojo Lahitok, aja hati manyu ara kito nenge?” \ No newline at end of file diff --git a/20/45.txt b/20/45.txt index b447ef2..bf665be 100644 --- a/20/45.txt +++ b/20/45.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 45 Koloningo cio fad ojo Yesu diho kajifitak kunenge, \v 46 “Itigeny katiyenak kulo cik. Imaruni kingalita ko kyelani kuna ikariti manyu imaruni fonyo lo cio to fajihit kulo cuk manyu onyumoti segeri kuna hitoha to lotubarihin ko fajihit kulo kiwora to karamahin. \v 47 Orujoti kajihit kulo lafuseritohin oto hati itotoroti kenite to kilifa na ikarit, koditi lo kuna cio obolo mute kitigema neicieng.'' -======= -\v 45 Koloningo cio fad ojo Yesu diho -kajifitak kunenge, \v 46 “Itigeny katiyenak kulo cik. Imaruni kingalita ko kyelani kuna ikariti manyu imaruni fonyo lo cio to fajihit kulo cuk manyu onyumoti segeri kuna hitoha to lotubarihin ko fajihit kulo kiwora to karamahin. \v 47 Orujoti kajihit kulo lafuseritohin oto hati itotoroti kenite to kilifa na ikarit, koditi lo kuna cio obolo mute kitigema neicieng noo”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 45 Koloningo cio fad ojo Yesu diho kajifitak kunenge, \v 46 “Itigeny katiyenak kulo cik. Imaruni kingalita ko kyelani kuna ikariti manyu imaruni fonyo lo cio to fajihit kulo cuk manyu onyumoti segeri kuna hitoha to lotubarihin ko fajihit kulo kiwora to karamahin. \v 47 Orujoti kajihit kulo lafuseritohin oto hati itotoroti kenite to kilifa na ikarit, koditi lo kuna cio obolo mute kitigema neicieng.'' \ No newline at end of file diff --git a/21/01.txt b/21/01.txt index 2f71762..811aadf 100644 --- a/21/01.txt +++ b/21/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 21 \v 1 Kolodeya Yesu, odeu kabarak icwara robia katwa lo sanduk na longon kaji lo Lobanga. \v 2 Odeu manyu lobo ngorwani lafuserito kakidahani ofihahi girisi are. \v 3 Oto ojo, “Ahirihohi nan ite tenya lo dede ene lafuserito kakidahanin lofik ilany cio fad. \v 4 kuno cio kude fad icwarati robia itutumo bara na longonore icieng ati inyi to kidak na longonore inyi icio fad kuna lotehita inyi to warun nenge” -======= -\c 21 \v 1 Kolodeya Yesu, odeu kabarak icwara robia katwa lo sanduk na longon kaji lo Lobanga. \v 2 Odeu manyu lobo ngorwani lafuserito kakidahani ofihahi girisi are. \v 3 Oto ojo, “Ahirihohi nan ite tenya lo dede ene lafuserito kakidahanin lofik ilany cio fad. \v 4 kuno cio kude fad icwarati robia itutumo bara na -longonore icieng ati inyi to kidak na longonore inyi icio fad kuna lotehita inyi to warun nenge” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 21 \v 1 Kolodeya Yesu, odeu kabarak icwara robia katwa lo sanduk na longon kaji lo Lobanga. \v 2 Odeu manyu lobo ngorwani lafuserito kakidahani ofihahi girisi are. \v 3 Oto ojo, “Ahirihohi nan ite tenya lo dede ene lafuserito kakidahanin lofik ilany cio fad. \v 4 kuno cio kude fad icwarati robia itutumo bara na longonore icieng ati inyi to kidak na longonore inyi icio fad kuna lotehita inyi to warun nenge.” \ No newline at end of file diff --git a/21/07.txt b/21/07.txt index c7ee13c..823a3d4 100644 --- a/21/07.txt +++ b/21/07.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 7 Itifi icieng inyi ojo, “katiyenani, itiihino mute kuno sangite anu? Adi nyio mute litotoro jimitan lonyiha icieng itiihino?” \v 8 Inyiahahi ojo, “Iririati kecio kinonongi. Tonyio becek kuna ca lofwonu to karana nei otenyati ojo ‘inyi nan’ kode ‘lonyiha tik’ kejif icieng. \v 9 Kalining ite tenyi tenyi kulo rem ko jorehin kebang, ocam kuna sangite re itiihino ketemoni ati ida ca lohicungi oruk lotuno”. -======= -\v 7 Itifi icieng inyi ojo, “katiyenani, itiihino mute kuno sangite anu? Adi nyio mute litotoro jimitan lonyiha -icieng itiihino?” \v 8 Inyiahahi ojo, “Iririati kecio kinonongi. Tonyio becek kuna ca lofwonu to karana nei otenyati ojo ‘inyi nan’ kode ‘lonyiha tik’ kejif icieng. \v 9 Kalining ite tenyi tenyi kulo rem ko jorehin kebang, ocam kuna sangite re itiihino ketemoni ati ida ca lohicungi oruk lotuno”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 7 Itifi icieng inyi ojo, “katiyenani, itiihino mute kuno sangite anu? Adi nyio mute litotoro jimitan lonyiha icieng itiihino?” \v 8 Inyiahahi ojo, “Iririati kecio kinonongi. Tonyio becek kuna ca lofwonu to karana nei otenyati ojo ‘inyi nan’ kode ‘lonyiha tik’ kejif icieng. \v 9 Kalining ite tenyi tenyi kulo rem ko jorehin kebang, ocam kuna sangite re itiihino ketemoni ati ida ca lohicungi oruk lotuno”. \ No newline at end of file diff --git a/21/14.txt b/21/14.txt index 118df8d..80a4c8f 100644 --- a/21/14.txt +++ b/21/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Ati keco ite iudo jimitan kiteny ca nyio? Kijo aja? \v 15 Tonyio ahicio ca nan ite tenyi tenyi ko genyun na lida kileng kadorok kuningi kitum peha ko ite. -======= -\v 14 Ati keco ite iudo jimitan kiteny ca nyio? Kijo aja? \v 15 Tonyio ahicio ca nan ite tenyi tenyi ko genyun na lida kileng kadorok kuningi kitum peha ko ite. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 14 Ati keco ite iudo jimitan kiteny ca nyio? Kijo aja? \v 15 Tonyio ahicio ca nan ite tenyi tenyi ko genyun na lida kileng kadorok kuningi kitum peha ko ite. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7f6ceba..8fe4b83 100644 --- a/manifest.json +++ b/manifest.json @@ -449,9 +449,16 @@ "20-23", "20-25", "20-27", + "20-29", + "20-34", "20-37", + "20-39", + "20-41", + "20-45", "21-title", + "21-01", "21-05", + "21-07", "21-10", "21-12", "21-25",