diff --git a/04/09.txt b/04/09.txt index 7c8ece4..c91192a 100644 --- a/04/09.txt +++ b/04/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Iyaru sitan inyi Jerusalem otedohi inyi many olele lo kaji lo Lobanga, ko jimitan diho inyi, “kalira isi kito lo Lobanga, ibiroro kof ten. \v 10 Tonyio igero ojo, ocik ca inyi malaikahin to isi lo kiriria isi otoc, \v 11 kiting ca iceng isi kai to kac kuneiceng.'' -======= -\v 9 Iyaru sitan inyi Jerusalem otedohi inyi many olele lo kaji lo Lobanga, ko jimitan diho inyi, “kalira isi kito lo Lobanga, ibiroro kof ten. \v 10 Tonyio igero ojo, ocik ca inyi malaikahin to isi lo kiriria isi otoc, \v 11 kiting ca iceng isi kai to kac kuneiceng ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 9 Iyaru sitan inyi Jerusalem otedohi inyi many olele lo kaji lo Lobanga, ko jimitan diho inyi, “kalira isi kito lo Lobanga, ibiroro kof ten. \v 10 Tonyio igero ojo, ocik ca inyi malaikahin to isi lo kiriria isi otoc, \v 11 kiting ca iceng isi kai to kac kuneiceng.'' \ No newline at end of file diff --git a/04/12.txt b/04/12.txt index 5171f3d..9f3bb87 100644 --- a/04/12.txt +++ b/04/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Ifotu Yesu ojo, “igero ojo, kotem Lahitok Lobanga nino”. \v 13 Kolokeru sitan kuno ilabati fad, ongerihi inyi many lobo tik ake.Oberuni Yesu to Nazaret. -======= -\v 12 Ifotu Yesu ojo, “igero ojo, kotem Lahitok Lobanga nino”. \v 13 Kolokeru sitan kuno ilabati fad, ongerihi inyi many lobo tik ake.Oberuni Yesu to Nazaret ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 12 Ifotu Yesu ojo, “igero ojo, kotem Lahitok Lobanga nino”. \v 13 Kolokeru sitan kuno ilabati fad, ongerihi inyi many lobo tik ake.Oberuni Yesu to Nazaret. \ No newline at end of file diff --git a/04/18.txt b/04/18.txt index 5f4f102..3e04588 100644 --- a/04/18.txt +++ b/04/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Ongon Okorif lo Lahitok kennei Tonyio lohitwe inyi nan Kititima layomit naijir iyo kakidahak Lohiculu inyi nan rihohino laharu Diho kuna lotora Ko kitikwenya diho kangodok Lolahahino cio kuna litigimati, \v 19 lo rihohino cio kari lo kisisio lo Lahitok.'' -======= -\v 18 Ongon Okorif lo Lahitok kennei Tonyio lohitwe inyi nan Kititima layomit naijir iyo kakidahak Lohiculu inyi nan rihohino laharu Diho kuna lotora Ko kitikwenya diho kangodok Lolahahino cio kuna litigimati, \v 19 lo rihohino cio kari lo kisisio lo Lahitok ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 18 Ongon Okorif lo Lahitok kennei Tonyio lohitwe inyi nan Kititima layomit naijir iyo kakidahak Lohiculu inyi nan rihohino laharu Diho kuna lotora Ko kitikwenya diho kangodok Lolahahino cio kuna litigimati, \v 19 lo rihohino cio kari lo kisisio lo Lahitok.'' \ No newline at end of file diff --git a/04/20.txt b/04/20.txt index 1ff7bb2..137cf44 100644 --- a/04/20.txt +++ b/04/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Oto ko bibira buk inyiahahi diho katiyoni ko kitongohino kof. Cio fad to lotubare ko fihahinoti konyeha ken nenge. \v 21 Oto icung to jimitan diho diho icieng; “Enefar litifuta ene kigero iya na lining ite” \v 22 Omaj cio fad inyi manyu ipanyiti tenyitenyi kuna ilemi lofwonu to kutuk nenge. Itifiati ojo, “Ida re kito lo Joseph ene?” -======= -\v 20 Oto ko bibira buk inyiahahi diho katiyoni ko kitongohino kof. Cio fad to lotubare ko fihahinoti konyeha ken nenge. \v 21 Oto icung to jimitan diho diho icieng; “Enefar litifuta ene kigero iya na lining ite” \v 22 Omaj cio fad inyi manyu ipanyiti tenyitenyi kuna ilemi lofwonu to kutuk nenge. Itifiati ojo, “Ida re kito lo Joseph ene?” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 20 Oto ko bibira buk inyiahahi diho katiyoni ko kitongohino kof. Cio fad to lotubare ko fihahinoti konyeha ken nenge. \v 21 Oto icung to jimitan diho diho icieng; “Enefar litifuta ene kigero iya na lining ite” \v 22 Omaj cio fad inyi manyu ipanyiti tenyitenyi kuna ilemi lofwonu to kutuk nenge. Itifiati ojo, “Ida re kito lo Joseph ene?” \ No newline at end of file diff --git a/04/23.txt b/04/23.txt index ceb7561..c786d3e 100644 --- a/04/23.txt +++ b/04/23.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 23 Ojo Yesu diho icieng; “dede irihohi ca ite nan ene kitidafi, diho nan ijjo; Daktarini, itifurioro ake. Itiyo ene kileng sangite kuna lohining ohoi ojo itii isi to Kapernaum. \v 24 Osodoro inyi ojo; Ahirihohi ite tenya lo dede, oru lobo kamoconi liruhuni to kalecieng. -======= -\v 23 Ojo Yesu diho icieng; “dede irihohi ca ite nan ene -kitidafi, diho nan ijjo; Daktarini, itifurioro ake. Itiyo ene kileng sangite kuna lohining ohoi ojo itii isi to -Kapernaum. \v 24 Osodoro inyi ojo; Ahirihohi ite tenya lo dede, oru lobo kamoconi liruhuni to kalecieng. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 23 Ojo Yesu diho icieng; “dede irihohi ca ite nan ene kitidafi, diho nan ijjo; Daktarini, itifurioro ake. Itiyo ene kileng sangite kuna lohining ohoi ojo itii isi to Kapernaum. \v 24 Osodoro inyi ojo; Ahirihohi ite tenya lo dede, oru lobo kamoconi liruhuni to kalecieng. \ No newline at end of file diff --git a/04/28.txt b/04/28.txt index 07fe93d..1040f38 100644 --- a/04/28.txt +++ b/04/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Ilongo cio to lotubare fad koloningiti ene tenya. \v 29 Ko wojunoti ifuhari inyi to kanghatua, ko ki yaroti kalele lo donge na loduho kang kai nenge ojo ojir kicule inyi to lofias. \v 30 Inyi ko lotita to kiji lo ilulung ko loro kikoi nenge. -======= -\v 28 Ilongo cio to lotubare fad koloningiti ene tenya. \v 29 Ko wojunoti ifuhari inyi to kanghatua, ko ki yaroti kalele lo donge na loduho kang kai nenge ojo ojir kicule inyi to lofias. \v 30 Inyi ko lotita to kiji lo ilulung ko loro kikoi nenge ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 28 Ilongo cio to lotubare fad koloningiti ene tenya. \v 29 Ko wojunoti ifuhari inyi to kanghatua, ko ki yaroti kalele lo donge na loduho kang kai nenge ojo ojir kicule inyi to lofias. \v 30 Inyi ko lotita to kiji lo ilulung ko loro kikoi nenge. \ No newline at end of file diff --git a/04/31.txt b/04/31.txt index 391b9ef..ac64734 100644 --- a/04/31.txt +++ b/04/31.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 31 Olo Yesu iya kapernaum kang na longon Galilea manyu to Sabit icak kitiyena cio. \v 32 Ipany icieng kitiyena nenge tonyio ongon kitiyena nenge ko golun. -======= -\v 31 Olo Yesu iya kapernaum kang na longon Galilea manyu to Sabit icak kitiyena cio. \v 32 Ipany icieng kitiyena nenge tonyio ongon kitiyena nenge ko golun ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 31 Olo Yesu iya kapernaum kang na longon Galilea manyu to Sabit icak kitiyena cio. \v 32 Ipany icieng kitiyena nenge tonyio ongon kitiyena nenge ko golun. \ No newline at end of file diff --git a/04/35.txt b/04/35.txt index 11abf55..964ae4b 100644 --- a/04/35.txt +++ b/04/35.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 35 Iryeng Yesu inyi ojo, “Tobuho! Torutu to ken nenge!” Na okorif ko borahino latungani kof ketemoni necieng fad ko rutuno to ken nenge ida opot ko lobo faji. \v 36 Cio pili ko kipany itifiati kenite kunecieng ake ake. Nyio ene kitiyena? To golun ko twero iryenga inyi okorifi kuna irohori orutu! \v 37 layomit nenge ko kisararu iric na kof. -======= -\v 35 Iryeng Yesu inyi ojo, “Tobuho! Torutu to ken nenge!” Na okorif ko borahino latungani kof ketemoni necieng fad ko rutuno to ken nenge ida opot ko lobo faji. \v 36 Cio pili ko kipany itifiati kenite kunecieng ake ake. Nyio ene kitiyena? To golun ko twero iryenga inyi okorifi kuna irohori orutu! \v 37 layomit nenge ko kisararu iric na kof. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 35 Iryeng Yesu inyi ojo, “Tobuho! Torutu to ken nenge!” Na okorif ko borahino latungani kof ketemoni necieng fad ko rutuno to ken nenge ida opot ko lobo faji. \v 36 Cio pili ko kipany itifiati kenite kunecieng ake ake. Nyio ene kitiyena? To golun ko twero iryenga inyi okorifi kuna irohori orutu! \v 37 layomit nenge ko kisararu iric na kof. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 59381dd..21a8c2e 100644 --- a/manifest.json +++ b/manifest.json @@ -114,12 +114,21 @@ "03-36", "04-title", "04-01", + "04-03", "04-05", "04-08", + "04-09", + "04-12", "04-14", "04-16", + "04-18", + "04-20", + "04-23", "04-25", + "04-28", + "04-31", "04-33", + "04-35", "04-38", "04-40", "05-01",