Fri Jun 22 2018 00:13:32 GMT-0400 (Eastern Daylight Time)

This commit is contained in:
joeg 2018-06-22 00:13:32 -04:00
parent fece8ff8fb
commit 3a8eed326a
2 changed files with 2 additions and 10 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 13 \v 1 Yesumi mono mai yerarem mapa asavimi kumimi mana yogam wata mano sasamemi semi sisao amonamo manugam Onampa ma'i wane. \v 2 Afo Yesu anona waya sasamem, manisem, emi amonano mana ma - afo-afo mana amona, mana on amuga buwatene masidem magapa intafuranam kumitem.
=======
\v 1 Yesumi mono mai yerarem maps asavemi kumimi mana yogam wata mano sasamemi semi sisao amonano manugam may wane. \v 2 Afo Yesu anona waya sasamemi manisem emi amonano mana ma afoafo mana amonano mana om amuga buwatene masidem magapa i.
>>>>>>> 456aca578aace2e6979e64ffd960f4c2c83d5eb3
\c 13 \v 1 Yesumi mono mai yerarem mapa asavimi kumimi mana yogam wata mano sasamemi semi sisao amonamo manugam Onampa ma'i wane. \v 2 Afo Yesu anona waya sasamem, manisem, emi amonano mana ma - afo-afo mana amona, mana on amuga buwatene masidem magapa intafuranam kumitem.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 3 Afo Yesu kumantem olive anuga monoma anopa. Pita nampa Jemsi, Joni, Entru inta emi yeyago waka. \v 4 Emi seyuya sisimeno, nantewa mini anene faworite - nafi? Afo naye anenemano ua, naye avuawaga mini nuram fawaritene?
=======
\v 3 Afo Jesu kumantem olive anuga monoma anapa pita nampa Jemsi. Joni .Pita. Entru inta emi yeyaga wata. \v 4 Emi seyuya sisimeno . nantewa mini anene fawaritenafi? Afo nage anenemano wa nayeavuawaga mini nuram fawarintene? Jesu agoyantem gigime dafima sokeogo manawagi munawaya buwagigi mono.
>>>>>>> 456aca578aace2e6979e64ffd960f4c2c83d5eb3
\v 3 Afo Yesu kumantem olive anuga monoma anopa. Pita nampa Jemsi, Joni, Entru inta emi yeyago waka. \v 4 Emi seyuya sisimeno, nantewa mini anene faworite - nafi? Afo naye anenemano ua, naye avuawaga mini nuram fawaritene?