diff --git a/12/39.txt b/12/39.txt index 6954fd3..38e1a46 100644 --- a/12/39.txt +++ b/12/39.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 39 Ati iniangata ene; ngara oyen monye lo kaji tik na lolotunore kakokoni, ngida ongerihi ogili kaji nenge. \v 40 Ojir manyu ite ikukumahino tonyio olotu mute kito lo tungani to tik na lida ite ikodomo”. -======= -\v 39 Ati iniangata ene; ngara oyen monye lo kaji tik na lolotunore kakokoni, ngida ongerihi ogili kaji nenge. \v 40 Ojir manyu ite ikukumahino tonyio olotu mute kito lo tungani to tik na lida ite ikodomo”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 39 Ati iniangata ene; ngara oyen monye lo kaji tik na lolotunore kakokoni, ngida ongerihi ogili kaji nenge. \v 40 Ojir manyu ite ikukumahino tonyio olotu mute kito lo tungani to tik na lida ite ikodomo”. \ No newline at end of file diff --git a/12/41.txt b/12/41.txt index 94da098..5135edf 100644 --- a/12/41.txt +++ b/12/41.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 41 Itifi Petero ojo Lahitok, itenya isi ene kitisirani diho ohoi kode diho cio fad? \v 42 Inyiahahi Lahitok ojo, “ngai hati kalanyoni na igeny ligenoro na lofik Lahitok olanyu karwaak kunenge kicwara robia kuneicieng kulo daha to tik na ibehi? \v 43 Ojir ca diho na karwaani lo lotu Lahitok nenge orumahi itiyo ji koloitu inyi. \v 44 Ahirihohi tenya lo dede ofik ca inyi ara kalanyunoni lo sangite kunenge fad. -======= -\v 41 Itifi Petero ojo Lahitok, itenya isi ene kitisirani -diho ohoi kode diho cio fad? \v 42 Inyiahahi Lahitok ojo, “ngai hati kalanyoni na igeny ligenoro na lofik -Lahitok olanyu karwaak kunenge kicwara robia kuneicieng kulo daha to tik na ibehi? \v 43 Ojir ca diho na karwaani lo lotu Lahitok nenge orumahi itiyo ji koloitu inyi. \v 44 Ahirihohi tenya lo dede ofik ca inyi ara kalanyunoni lo sangite kunenge fad. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 41 Itifi Petero ojo Lahitok, itenya isi ene kitisirani diho ohoi kode diho cio fad? \v 42 Inyiahahi Lahitok ojo, “ngai hati kalanyoni na igeny ligenoro na lofik Lahitok olanyu karwaak kunenge kicwara robia kuneicieng kulo daha to tik na ibehi? \v 43 Ojir ca diho na karwaani lo lotu Lahitok nenge orumahi itiyo ji koloitu inyi. \v 44 Ahirihohi tenya lo dede ofik ca inyi ara kalanyunoni lo sangite kunenge fad. \ No newline at end of file diff --git a/12/45.txt b/12/45.txt index 8cb0eb9..5f1636d 100644 --- a/12/45.txt +++ b/12/45.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 45 Adi ba ngojo na karwaani to tau nenge ojo ‘ida lahitok nei olotuno deu icak lumo karwaak kuna kude ko daha omata oruma. \v 46 Oto hati lahitok lo na karwaani ko lotuno far na lida inyi okodomo ojo olotuno Lahitok iyo tik na lida inyi oyen. Olotu ingungut inyi ara tuli ico inyi ongar lohitongore ko kuna lida iruk Lobanga. -======= -\v 45 Adi ba ngojo na karwaani to tau nenge ojo ‘ida lahitok nei olotuno deu icak lumo karwaak kuna kude ko daha omata oruma. \v 46 Oto hati lahitok lo na karwaani ko lotuno far na lida inyi okodomo ojo olotuno Lahitok iyo tik na lida inyi oyen. Olotu ingungut inyi ara tuli ico inyi ongar -lohitongore ko kuna lida iruk Lobanga. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 45 Adi ba ngojo na karwaani to tau nenge ojo ‘ida lahitok nei olotuno deu icak lumo karwaak kuna kude ko daha omata oruma. \v 46 Oto hati lahitok lo na karwaani ko lotuno far na lida inyi okodomo ojo olotuno Lahitok iyo tik na lida inyi oyen. Olotu ingungut inyi ara tuli ico inyi ongar lohitongore ko kuna lida iruk Lobanga. \ No newline at end of file diff --git a/12/47.txt b/12/47.txt index 8ac24a5..c0494f9 100644 --- a/12/47.txt +++ b/12/47.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 47 Na karwaani loyen wahun lo lahitok nenge ida hati ikukumahino kode ida itii tohi na lowak Lahitok nenge, olumi inyi kario becek. \v 48 Ati na lida oyen itii hati tohi na locamare inyi to lumo, olumi inyi kario kude kuting. Diho tungani na licori obolo okodomoti manyu tohi na hitok, manyu diho tungani na litibarahini becek owahiti manyu becek ilany. -======= -\v 47 Na karwaani loyen wahun lo lahitok nenge ida hati ikukumahino kode ida itii tohi na lowak Lahitok nenge, olumi inyi kario becek. \v 48 Ati na lida oyen itii hati tohi na locamare inyi to lumo, olumi inyi kario kude kuting. Diho tungani na licori obolo okodomoti manyu tohi na hitok, manyu diho tungani na litibarahini becek owahiti manyu becek ilany. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 47 Na karwaani loyen wahun lo lahitok nenge ida hati ikukumahino kode ida itii tohi na lowak Lahitok nenge, olumi inyi kario becek. \v 48 Ati na lida oyen itii hati tohi na locamare inyi to lumo, olumi inyi kario kude kuting. Diho tungani na licori obolo okodomoti manyu tohi na hitok, manyu diho tungani na litibarahini becek owahiti manyu becek ilany. \ No newline at end of file diff --git a/12/54.txt b/12/54.txt index d5ffbbb..cb816a8 100644 --- a/12/54.txt +++ b/12/54.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 54 Kalideu ite idis ongon lodoyore lo kolong, ijo ite oca ca kuju, oca manyu dede. \v 55 Manyu kolo kuta kiyoma to ngati lo orof, ijo, “onok ca ene far, onok manyu. \v 56 Katelorok iyen ite hera kibebelo lo kof ko kai. Aja hati ite ida iyen hera kof lo kuno faritin? -======= -\v 54 Kalideu ite idis ongon lodoyore lo kolong, ijo ite oca ca kuju, oca manyu dede. \v 55 Manyu kolo kuta -kiyoma to ngati lo orof, ijo, “onok ca ene far, onok manyu. \v 56 Katelorok iyen ite hera kibebelo lo kof ko -kai. Aja hati ite ida iyen hera kof lo kuno faritin? ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 54 Kalideu ite idis ongon lodoyore lo kolong, ijo ite oca ca kuju, oca manyu dede. \v 55 Manyu kolo kuta kiyoma to ngati lo orof, ijo, “onok ca ene far, onok manyu. \v 56 Katelorok iyen ite hera kibebelo lo kof ko kai. Aja hati ite ida iyen hera kof lo kuno faritin? \ No newline at end of file diff --git a/12/57.txt b/12/57.txt index 75b3eae..6626f39 100644 --- a/12/57.txt +++ b/12/57.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 57 Nyio ida ite to kenite kuningi iheru tohi na ijir? \v 58 Kaliloro isi ko kadoroni nino iyo lokiho, totem bebe yomo ko inyi to kikoi kode kiyaru ha ca inyi isi diho kangotoni lo tenya, kico kangotoni lo tenya isi diho lahitok lo polis manyu lahitok lo polis ko kibirohino isi mabus. \v 59 Ahirihohi ida ca isi irihe irutu many ikerehi duma lo kipal nino many tarifati. -======= -\v 57 Nyio ida ite to kenite kuningi iheru tohi na ijir? - \v 58 Kaliloro isi ko kadoroni nino iyo lokiho, totem bebe yomo ko inyi to kikoi kode kiyaru ha ca inyi isi diho kangotoni lo tenya, kico kangotoni lo tenya isi diho lahitok lo polis manyu lahitok lo polis ko kibirohino isi mabus. \v 59 Ahirihohi ida ca isi irihe irutu many ikerehi duma lo kipal nino many tarifati ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 57 Nyio ida ite to kenite kuningi iheru tohi na ijir? \v 58 Kaliloro isi ko kadoroni nino iyo lokiho, totem bebe yomo ko inyi to kikoi kode kiyaru ha ca inyi isi diho kangotoni lo tenya, kico kangotoni lo tenya isi diho lahitok lo polis manyu lahitok lo polis ko kibirohino isi mabus. \v 59 Ahirihohi ida ca isi irihe irutu many ikerehi duma lo kipal nino many tarifati. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 3319146..c0bbcaf 100644 --- a/manifest.json +++ b/manifest.json @@ -183,8 +183,13 @@ "12-22", "12-27", "12-31", + "12-41", + "12-45", + "12-47", "12-49", "12-51", + "12-54", + "12-57", "13-title", "13-01", "13-04",