diff --git a/08/01.txt b/08/01.txt index d073350f..4490e22b 100644 --- a/08/01.txt +++ b/08/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 8 \v 1 Rü yeguma mapunewa i narü igü ngechüchü, müuma ga düügü nawe narií . \v 2 Rü ngechüchüka niü̃ ga wüí jata ga o̰riünekü dawékü.Rü ngechüchüpeé ngacaa̰püü̃; rü ñanagürü nüü '' pá korí kúrü mé ji ingu ñaa chaune i na pí . \v 3 ngechüchü rü naetü na wemé rü nüü̃m ni ngogu rü nanagurü " chanawaẽ.Marü ina pií chi.''ñegümatawa ni ḛgü norü depraũne da waüẽkü. -======= -\c 8 \v 1 \v 2 \v 3 1/Rü ->>>>>>> 7d1ff4873479dfbfc564d7c3eb9b5a2ef72742b4 +\c 8 \v 1 Rü yeguma mapunewa i narü igü ngechüchü, müuma ga düügü nawe narií . \v 2 Rü ngechüchüka niü̃ ga wüí jata ga o̰riünekü dawékü.Rü ngechüchüpeé ngacaa̰püü̃; rü ñanagürü nüü '' pá korí kúrü mé ji ingu ñaa chaune i na pí . \v 3 ngechüchü rü naetü na wemé rü nüü̃m ni ngogu rü nanagurü " chanawaẽ.Marü ina pií chi.''ñegümatawa ni ḛgü norü depraũne da waüẽkü. \ No newline at end of file diff --git a/09/01.txt b/09/01.txt index afa2e346..250838ea 100644 --- a/09/01.txt +++ b/09/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 9 \v 1 \v 2 wii. Ngechuchu wii nguégu ni üe, rü tokutüwã̀ na úgu, rü na̰chianewà na ngu.2/ Ñà̰ani, naütawà nanagagü wii yatü baraparakü kamiyagu kakü̃. Marü nü̃na daugu na a ógü̃ü̃, Ñgechuchu ñáü̃ nüü̃ yima yatükü baraparakü̃: "Chaunẽ, na taae, kurü chieü̃ ore marü ina tà̰." -======= -\c 9 \v 1 Ngechuchu wií nguegu ni üe, rü tokutüwa na ũ, rü nórütama ĩãnewa na ngṴ́. \v 2 Daani, rü naü̃tawa nana ngetaü̃gü wii yatü baraparakü kamiyuga ka̰kü . Nüna da̰úgÙ i norü o̰gü Ngechuchu ña̰ü̃ nṵ̈ü̃ a yima ya̰tükü baraparakü; '' cha̰ùnẽ̀, nataãẽ, erü kurü chiḛü̃gü rü ma̰rü kuü̃ chanangechaü̃.'' ->>>>>>> 91667b42a33492b2bf4c560993d662e3db3e24f1 +\c 9 \v 1 Ngechuchu wií nguegu ni üe, rü tokutüwa na ũ, rü nórütama ĩãnewa na ngṴ́. \v 2 Daani, rü naü̃tawa nana ngetaü̃gü wii yatü baraparakü kamiyuga ka̰kü . Nüna da̰úgÙ i norü o̰gü Ngechuchu ña̰ü̃ nṵ̈ü̃ a yima ya̰tükü baraparakü; '' cha̰ùnẽ̀, nataãẽ, erü kurü chiḛü̃gü rü ma̰rü kuü̃ chanangechaü̃.'' \ No newline at end of file diff --git a/09/20.txt b/09/20.txt index 63f5c3df..dc6c5db9 100644 --- a/09/20.txt +++ b/09/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 \v 21 \v 22 NGchuchu rü nügü ínidau, rü ñiü̃ nadau, rü ñaü̃ ngiü̃: ¨Pa chauakü, nataãẽ; kurü õ kunuarü mḛẽ¨. -======= -\v 22 \v 20 Daeti, wie a ñḛé ga 12 taunekü poraaküma ãgüechae, ngechuchu weana ni ta ũ rü nachiruchipenü ti ngõgü. \v 21 Erü tügümátama nüü̃ti u; ''rü ñegumachi nachiruüikatama chi ngõgümaregu rü chi cha̰ùkani ta̰ãne.'' ->>>>>>> 91667b42a33492b2bf4c560993d662e3db3e24f1 +\v 22 \v 20 Daeti, wie a ñḛé ga 12 taunekü poraaküma ãgüechae, ngechuchu weana ni ta ũ rü nachiruchipenü ti ngõgü. \v 21 Erü tügümátama nüü̃ti u; ''rü ñegumachi nachiruüikatama chi ngõgümaregu rü chi cha̰ùkani ta̰ãne.'' \ No newline at end of file diff --git a/10/01.txt b/10/01.txt index c1fcbe30..0b596b2f 100644 --- a/10/01.txt +++ b/10/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 10 \v 1 1\ Ngechüchũ nãkã na kagünũru nãikütüãre disipülõ chi nuna nã ãi nõru ãütõridã tõrü maü impũrõun, chĩ inã tãüchiu , chĩ nã mẽü̃nca gũũnẽ chĩ dawẽ. -======= -\c 10 \v 1 1 NgẽchÜchù nĀkã nÁ kagÜnõrù nãikÜtÜãrÜ tãrÉ disipÜlõ chi nÙna nã ãi nÕrù ãÜtõridã tõrÜ maÜ̃ maÜ impũrõ, chi inã tãÜchiù , chĩ nã mẽũncĀ gũũn i jũũnẽ chi gũiù i dawé. ->>>>>>> d8d7f35b2c5bbf12af0a9decaca310dee8632e5f +\c 10 \v 1 1 NgẽchÜchù nĀkã nÁ kagÜnõrù nãikÜtÜãrÜ tãrÉ disipÜlõ chi nÙna nã ãi nÕrù ãÜtõridã tõrÜ maÜ̃ maÜ impũrõ, chi inã tãÜchiù , chĩ nã mẽũncĀ gũũn i jũũnẽ chi gũiù i dawé. \ No newline at end of file diff --git a/10/02.txt b/10/02.txt index 1d8d24cc..81625873 100644 --- a/10/02.txt +++ b/10/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Nũmãĩ , guun nãẽgã i 12 apõstoles ru nããnii nüirãru chimon nĩĩ chi nãẽgãtã pẽẽ, Andre naẽnẽ , Chantiago , chi nãne Zebedeo , chĩ nãẽnẽẽ i Juan. \v 3 Piripi chi Baturümẽ , Tümã chi Mateü , noru dieru aru deruu , chantiagü nãne Afeü õchĩ tadeu. \v 4 chimon chĩ zelote õchi juda Ṵ̈Iscariote , nã trãikiũnã üntã. -======= -\v 2 \v 3 \v 4 2 Nũmaĩ , guun nãẽgã i 12 apõtoles ru nĀĀ nii nÜirĀru simon nii chi nãẽgãtã pẽẽ , Andre naene , santiago , chi nãenè , i Juan. 3 Felipe chĩ Bãrtolomè , Tomas chĩ Mateo , nõrũ dieru arÙ deru , Santiago , chĩ nãnè Alfeo chĩ tudeo. ->>>>>>> d8d7f35b2c5bbf12af0a9decaca310dee8632e5f +\v 2 Nũmãĩ , guun nãẽgã i 12 apõstoles ru nããnii nüirãru chimon nĩĩ chi nãẽgãtã pẽẽ, Andre naẽnẽ , Chantiago , chi nãne Zebedeo , chĩ nãẽnẽẽ i Juan. \v 3 Piripi chi Baturümẽ , Tümã chi Mateü , noru dieru aru deruu , chantiagü nãne Afeü õchĩ tadeu. \v 4 chimon chĩ zelote õchi juda Ṵ̈Iscariote , nã trãikiũnã üntã. \ No newline at end of file diff --git a/10/11.txt b/10/11.txt index 3be69889..f61e3f64 100644 --- a/10/11.txt +++ b/10/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 \v 12 \v 13 11\Güẽürün i iãnẽ tãünẽwãõ iãnẽ yã iranẽwã güẽmã pirü chõgü tauntai ĩ pi chõũngũn ñumãtã gün i yã ingü. -======= -\v 11 \v 12 Íwa pĩ jügürú perü moẽgú'' meÁ pirú chó dã ipãtÁwã''. \v 13 Yĩmã ĩpãta nã dignãgü gũũn y põrã tüpãnãarú pora i na yü güeãün.yã düẽ. ->>>>>>> cf18a1c088f581cd1d63a4a57d88ce4b644fe181 +\v 11 \v 12 Íwa pĩ jügürú perü moẽgú'' meÁ pirú chó dã ipãtÁwã''. \v 13 Yĩmã ĩpãta nã dignãgü gũũn y põrã tüpãnãarú pora i na yü güeãün.yã düẽ. \ No newline at end of file diff --git a/10/26.txt b/10/26.txt index 0be4b323..d105ed72 100644 --- a/10/26.txt +++ b/10/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 \v 26 Güégümãtãi taüün pĩ münẽgüü nú úngú, ẽrü ná táú i güémüün í õcültõüng güün nã güõmã -======= -\v 26 güãgümãtãi taüün pĩ nuñegüü nú ungü, erü ná táú i guẽmüü i ãcüllũũng güün nã güõmã chĩ tãuung i küü i tãmã ña meeün. \v 27 güẽmã nĩ chi uü waẽneünwã, kũ ngõnẽ u mãã pẽã hũgü. i jüeú quená nĩ pĩ inüẽgüü̃ meá tãchiewã, nú pi ügüüntã güü i ipãtarü dáünãwá. ->>>>>>> 5ee8286d7c52f7315596181fd7cf223130425592 +\v 26 güãgümãtãi taüün pĩ nuñegüü nú ungü, erü ná táú i guẽmüü i ãcüllũũng güün nã güõmã chĩ tãuung i küü i tãmã ña meeün. \v 27 güẽmã nĩ chi uü waẽneünwã, kũ ngõnẽ u mãã pẽã hũgü. i jüeú quená nĩ pĩ inüẽgüü̃ meá tãchiewã, nú pi ügüüntã güü i ipãtarü dáünãwá. \ No newline at end of file