diff --git a/19/47.txt b/19/47.txt index 2b9b4f7..0f58ce6 100644 --- a/19/47.txt +++ b/19/47.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 47 Faritin fad itiyena orumu inyi to kaji lo Lobanga, ati kadwarak kuna hitoha, katiyenak kulo cik ko kabolorok to kiji lo cio orumu otemati kifadaru inyi. \v 48 Oto hati ida icieng orumu kikoi lo kifada inyi tonyio cio pili okodomoti ningo tenya nenge. -======= -\v 47 Faritin fad itiyena orumu inyi to kaji lo Lobanga, ati kadwarak kuna hitoha, katiyenak kulo cik ko kabolorok to kiji lo cio orumu otemati kifadaru inyi. \v 48 Oto hati ida icieng orumu kikoi lo kifada inyi tonyio cio pili okodomoti ningo tenya nenge ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 47 Faritin fad itiyena orumu inyi to kaji lo Lobanga, ati kadwarak kuna hitoha, katiyenak kulo cik ko kabolorok to kiji lo cio orumu otemati kifadaru inyi. \v 48 Oto hati ida icieng orumu kikoi lo kifada inyi tonyio cio pili okodomoti ningo tenya nenge. \ No newline at end of file diff --git a/20/01.txt b/20/01.txt index c5359fe..d0ad6c1 100644 --- a/20/01.txt +++ b/20/01.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD -\c 20 \v 1 Lobo far kalitiyena inyi cio to kaji lo Lobanga ko kititima layomit na ijir, kadwarak kuna hitoha ko katiyenak kulo cik ara lobito ko lohitwaha ko fwonuno dih inyi. \v 2 Ojimi diho inyi, ‘kirihohi ohoi tani twero itiyore isi kuno sangite? Ngai lohico isi ene twero?’ -======= \c 20 \v 1 Lobo far kalitiyena inyi cio to kaji lo Lobanga ko kititima layomit na ijir, kadwarak kuna hitoha ko katiyenak kulo cik ara lobito ko lohitwaha ko fwonuno dih inyi. \v 2 Ojimi diho inyi, ‘kirihohi ohoi tani -twero itiyore isi kuno sangite? Ngai lohico isi ene twero?’ ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +twero itiyore isi kuno sangite? Ngai lohico isi ene twero?’ \ No newline at end of file diff --git a/20/03.txt b/20/03.txt index 1313c65..165f9fd 100644 --- a/20/03.txt +++ b/20/03.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 3 Inyiahahi inyi ojo, “Ahitifi manyu nan ite kitifit, kirihohi nan. \v 4 Kibatisa lo Jon, olotu afa to kai kode diho cio?” -======= \v 3 Inyiahahi inyi ojo, “Ahitifi manyu nan ite kitifit, -kirihohi nan. \v 4 Kibatisa lo Jon, olotu afa to kai kode diho cio?” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +kirihohi nan. \v 4 Kibatisa lo Jon, olotu afa to kai kode diho cio?” \ No newline at end of file diff --git a/20/05.txt b/20/05.txt index 3f319bf..33a70b3 100644 --- a/20/05.txt +++ b/20/05.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 5 Oteny icieng ake ake ojo, “kolohijo ca to kai ojo ca inyi, Nyio hati afa ite ida iruk tenya lo Jon? \v 6 Ati kolohijo diho cio, oto ca kuno cio fad kicak ohoi to morutok tonyio oyen icieng fad jimitan ara afa Jon kamocani”. -======= -\v 5 Oteny icieng ake ake ojo, “kolohijo ca to kai ojo ca inyi, Nyio hati afa ite ida iruk tenya lo Jon? \v 6 Ati kolohijo diho cio, oto ca kuno cio fad kicak ohoi -to morutok tonyio oyen icieng fad jimitan ara afa Jon kamocani”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 5 Oteny icieng ake ake ojo, “kolohijo ca to kai ojo ca inyi, Nyio hati afa ite ida iruk tenya lo Jon? \v 6 Ati kolohijo diho cio, oto ca kuno cio fad kicak ohoi +to morutok tonyio oyen icieng fad jimitan ara afa Jon kamocani”. \ No newline at end of file diff --git a/20/07.txt b/20/07.txt index fe21511..b0811be 100644 --- a/20/07.txt +++ b/20/07.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 7 Oto dong icieng inyiahahi ojo, “ida ohoi kiyen faji na loreunore kibatisa lo Jon”. \v 8 Ojo Yesu, “ida manyu ca nan ahirihohi ite twero na latiyore nan kuno sangite”. -======= \v 7 Oto dong icieng inyiahahi ojo, “ida ohoi kiyen faji na loreunore kibatisa lo Jon”. \v 8 Ojo Yesu, “ida manyu ca nan ahirihohi ite twero na latiyore nan -kuno sangite”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +kuno sangite”. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 147a5fc..84924d4 100644 --- a/manifest.json +++ b/manifest.json @@ -236,6 +236,10 @@ "19-43", "19-45", "20-title", + "20-01", + "20-03", + "20-05", + "20-07", "20-09", "20-11", "20-13",