From 33646dc6740845d65b17188549d07a59dccce0cc Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Wed, 20 Apr 2022 18:34:30 -0500 Subject: [PATCH] Wed Apr 20 2022 18:34:29 GMT-0500 (GMT-05:00) --- 01/01.txt | 6 +----- 01/06.txt | 6 +----- 01/08.txt | 6 +----- 01/11.txt | 6 +----- 01/13.txt | 6 +----- 01/15.txt | 6 +----- 01/18.txt | 6 +----- 01/20.txt | 6 +----- 02/03.txt | 6 +----- 02/15.txt | 6 +----- 05/01.txt | 6 +----- 05/03.txt | 6 +----- 05/06.txt | 6 +----- 05/10.txt | 6 +----- manifest.json | 30 ++++++++++++++++++++---------- 15 files changed, 34 insertions(+), 80 deletions(-) diff --git a/01/01.txt b/01/01.txt index 10be89b1..de4d0dca 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Umakgol xtakunikan xkamanan Israel tiku tanukgolh nak Egipto chu Jacob, chatunu chatunu lenkgolh xlilakgapasnikan; \v 2 Rubén ,Simeón ,Leví chu Juda. \v 3 Isacar , Zabulón chu Benjamín, \v 4 Dan, Neftalí, Gad chu Aser. \v 5 Putum tiku tataxtukgol Jacob xwanit tutumpuxamakaw. Jose xwilacha nak Egipto. -======= -\c 1 \v 1 Umakgolh xtakunikan xkamanan Israel tiku tanukgolh nak Egipto chu Jacob, chatunu chatunu lenkgolh xlilakgapasnikan: \v 2 Rubén ,Simeón ,Leví chu Juda. \v 3 Isacar , Zabulón chu Benjamín, \v 4 Dan, Neftalí, Gad chu Aser. \v 5 Putum tiku tataxtukgolh Jacob xwanit tutumpuxamakaw. Jose xlamaja nak Egipto. ->>>>>>> 01fb3f4279976f78d056293948ce40c8f3707a27 +\c 1 \v 1 Umakgolh xtakunikan xkamanan Israel tiku tanukgolh nak Egipto chu Jacob, chatunu chatunu lenkgolh xlilakgapasnikan: \v 2 Rubén ,Simeón ,Leví chu Juda. \v 3 Isacar , Zabulón chu Benjamín, \v 4 Dan, Neftalí, Gad chu Aser. \v 5 Putum tiku tataxtukgolh Jacob xwanit tutumpuxamakaw. Jose xlamaja nak Egipto. \ No newline at end of file diff --git a/01/06.txt b/01/06.txt index b4ff6c37..38b007b9 100644 --- a/01/06.txt +++ b/01/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 José, putum xnatalanin chu putum wanti xlamakgolh ama kilhtamaku nigkol. \v 7 Chu israelitas lhuwa kgalikgol xkamanan chu lhuwamakgolh chu laktliwaka xwankgonit chu katiyatni tatsama. -======= -\v 6 Putum xnatalanin José chu putum wanti xlamakgolh ama kilhtamaku nigkol. \v 7 Chu israelitas lhuwa kgalikgol xkamanan chu klhuwamakgolh chu lak tliwake xwankgonit chu katiyatni tatsama. ->>>>>>> 01fb3f4279976f78d056293948ce40c8f3707a27 +\v 6 Putum xnatalanin José chu putum wanti xlamakgolh ama kilhtamaku nigkol. \v 7 Chu israelitas lhuwa kgalikgol xkamanan chu klhuwamakgolh chu lak tliwake xwankgonit chu katiyatni tatsama. \ No newline at end of file diff --git a/01/08.txt b/01/08.txt index c72e1a60..414929ca 100644 --- a/01/08.txt +++ b/01/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Chu a chatunu rey mil mapaksinan nak Egipto, tiku nixlakapasa José. \v 9 Chu xla wa, ''kaugxtit tamakgolh israelitas lanka chu tliwaka tasikgolh chu akinan nichuna. \v 10 Katantit, kaskalala kalatachiwinanao, parwa na tatzukuy latalatlau lanka na chankgoy chu akgtum na wankgoy chu na mashtatkgoy uma katiyatni. -======= -\v 8 Chu a chatunu xa puxku mil mapaksinan nak Egipto, tiku nixlakapasa José. \v 9 Chu xla wa, ''kaugxtit tamakgolh israelitas lanka chu tliwaka tasikgolh chu akinan nichuna. \v 10 Katantit lu kuenta ka tlawao, parwa na tatzukuy latalatlau lanka na chankgoy chu akgtum na wankgoy chu na mashtatkgoy uma katiyatni. ->>>>>>> 01fb3f4279976f78d056293948ce40c8f3707a27 +\v 8 Chu a chatunu xa puxku mil mapaksinan nak Egipto, tiku nixlakapasa José. \v 9 Chu xla wa, ''kaugxtit tamakgolh israelitas lanka chu tliwaka tasikgolh chu akinan nichuna. \v 10 Katantit lu kuenta ka tlawao, parwa na tatzukuy latalatlau lanka na chankgoy chu akgtum na wankgoy chu na mashtatkgoy uma katiyatni. \ No newline at end of file diff --git a/01/11.txt b/01/11.txt index 2cfe4c19..5c445fbe 100644 --- a/01/11.txt +++ b/01/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Chu xla wilikgolh xha puxku xkuj' ni tiku na mashkíy xla pahla taskujut. Chu israelitas tlawakgolh laklanka kachikinkan xla Faraón; Pitón chu Ramsés. \v 12 Chu Egipsios xmapatinakgoy, israelitas laklanka wankgolh. Chu Egipsios tsukukgolh makpekuanikgolh israelitas. -======= -\v 11 Chu xlakan wilikgolh xa puxku skujnin tiku xamakgolh makapatinankgoy xpalakata xpalha xxtaskujutkan. Chu israelitas tlawakgolh laklanka kachikinin xla Faraó: Pitón chu Ramsés. \v 12 Chu Egipcios xmakgapatinamakgolh, israelitas chu xlakan tlak lhuwamakgolh. Chu Egipcios tsukukgolh mak pekuanikgoy israelitas. ->>>>>>> 01fb3f4279976f78d056293948ce40c8f3707a27 +\v 11 Chu xlakan wilikgolh xa puxku skujnin tiku xamakgolh makapatinankgoy xpalakata xpalha xxtaskujutkan. Chu israelitas tlawakgolh laklanka kachikinin xla Faraó: Pitón chu Ramsés. \v 12 Chu Egipcios xmakgapatinamakgolh, israelitas chu xlakan tlak lhuwamakgolh. Chu Egipcios tsukukgolh mak pekuanikgoy israelitas. \ No newline at end of file diff --git a/01/13.txt b/01/13.txt index 178fc1a7..93506db8 100644 --- a/01/13.txt +++ b/01/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Egipsios tliwaka tsukukgolh maskujunakgoy israelitas. \v 14 Chu xlatamatkan lu tuwa xwanit xtatlaumanal xa palha taskujut nachuna taskujut xla katuwan. Chu putum taskujut lu tuwa xwanit. -======= -\v 13 Egipcios tliwaka tsukukgolh maskujukgoy israelitas. \v 14 Chu xlatamatkan lu tuwa xwanit ,xpalakata xtlawamakgolh lislama patsaps chu ladrillos nachuna taskujutkan nak katakuxtu. Chu putum taskujut lu tuwa xwanit. ->>>>>>> 01fb3f4279976f78d056293948ce40c8f3707a27 +\v 13 Egipcios tliwaka tsukukgolh maskujukgoy israelitas. \v 14 Chu xlatamatkan lu tuwa xwanit ,xpalakata xtlawamakgolh lislama patsaps chu ladrillos nachuna taskujutkan nak katakuxtu. Chu putum taskujut lu tuwa xwanit. \ No newline at end of file diff --git a/01/15.txt b/01/15.txt index f1bed027..39016027 100644 --- a/01/15.txt +++ b/01/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Chu rey xla Egipto kawanil amakgolh malaktashtinanin hebreas; chatum xwanikan Sifra, chu chatum Puá. \v 16 Chu wa; ''Acan na pinatit ugxatit lakpuskatni hebreas acan na lakachinkgoy xkamanan, liuna kaugxtit acan na lakachin. Par kawasa nawan , na makgniyatit; chu par tsumat, kalatamakelg. \v 17 Chu tamakgolh malaktashtina makpuwanikgolh DIOS chu ni tlawakgolh lata rey xla Egipto xmapaksinanit; chu tama laktsu kaman xlamakgolh. -======= -\v 15 Chu xa puxku Egipto kawanil amakgolh makchakenanin Hebreas; chatum xwanikan Sifra, chu chatum Puá. \v 16 Xla wa; ''Akxni na ukxatit akxni na laktaxtukgoy lak puskatni Hebreas, ka ukxtit akxni nata lakachin laks'katan. Par kawasa nawan , na makgniyatit; chu par tsumat, na latamay. \v 17 Chu mak'chakananin makpuwanikgolh DIOS chu ni tlawakgolh lata xa puxku xla Egipto kalimapeksilh chu chu xlakan mak xtakgolh nalatamakgoy laktsu lak'kgawasan. ->>>>>>> 01fb3f4279976f78d056293948ce40c8f3707a27 +\v 15 Chu xa puxku Egipto kawanil amakgolh makchakenanin Hebreas; chatum xwanikan Sifra, chu chatum Puá. \v 16 Xla wa; ''Akxni na ukxatit akxni na laktaxtukgoy lak puskatni Hebreas, ka ukxtit akxni nata lakachin laks'katan. Par kawasa nawan , na makgniyatit; chu par tsumat, na latamay. \v 17 Chu mak'chakananin makpuwanikgolh DIOS chu ni tlawakgolh lata xa puxku xla Egipto kalimapeksilh chu chu xlakan mak xtakgolh nalatamakgoy laktsu lak'kgawasan. \ No newline at end of file diff --git a/01/18.txt b/01/18.txt index eb7a388e..4c8930f3 100644 --- a/01/18.txt +++ b/01/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Chu rey xla Egipto tasanikgolh tama malaktashtinanin chu kawanil; ''¿ Tuku xpalakata chuna litlawanitantit pitama laksu kaman lamakgolh?'' \v 19 Tama malaktashtinanin wanikgolh Faraón ''Lakpuskatni hebreas ni xla chuna tamakgolh egipsias. Umakgolh lu tliwaka akan nak lakchinao akinan xkamanan eh xlakachinkgonit''. -======= -\v 18 Chu xa puxku Egipto katasanilh amakgolh mak'chakananin chu kawanil: ''¿ Tuku xpalakata limak xtaknitantit nalatamakgoy tama latsu lak kgawasan. \v 19 Chu xlakan wanikgolh Faraón: ''Lak puskatni Hebreas ni chuna la amakgolh Egipcias. Xlakan lak tliweke akxni na kalak'chan chatum mak'chakena xlakan he malakga tawinkgonit.'' ->>>>>>> 01fb3f4279976f78d056293948ce40c8f3707a27 +\v 18 Chu xa puxku Egipto katasanilh amakgolh mak'chakananin chu kawanil: ''¿ Tuku xpalakata limak xtaknitantit nalatamakgoy tama latsu lak kgawasan. \v 19 Chu xlakan wanikgolh Faraón: ''Lak puskatni Hebreas ni chuna la amakgolh Egipcias. Xlakan lak tliweke akxni na kalak'chan chatum mak'chakena xlakan he malakga tawinkgonit.'' \ No newline at end of file diff --git a/01/20.txt b/01/20.txt index ea8bada2..7702394e 100644 --- a/01/20.txt +++ b/01/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 DIOS maktakgali tamakgolh malaktashtina. Tama kachikin stakli chu lu tliwakga xwakgonitá. \v 21 tamakgolh malaktashtina makpuwanikgolh DIOS na mashkikgokalh xlilakapasnikan. \v 22 Chu Faraón mapaksinal putum xlilanka xpulatamat; Xlikana namakapinatit tama laksu kamanan nak kalgtuchuko, chu ni na makapinatit tiku tsumat na lakachin tama kalatamakgelh. -======= -\v 20 DIOS kamak takga'lhi amakgolh makg'chakananain. Chu pulataman stakli chu lak tliwakge wa. \v 21 Xpalakata makg'chakananin mak puwanikgolh DIOS wa xla xpalakata kamax'kilh xlkamanan. \v 22 Chu Faraón kalimapeksilh xliputum xpulatamat; "Na kamakapinatit amakgolh laktsu lak kgawasan nak kalgtuchuko wan tiku nalakgachinkgoy, chu na kamakxtakgatit laktsu lak tsuman." ->>>>>>> 01fb3f4279976f78d056293948ce40c8f3707a27 +\v 20 DIOS kamak takga'lhi amakgolh makg'chakananain. Chu pulataman stakli chu lak tliwakge wa. \v 21 Xpalakata makg'chakananin mak puwanikgolh DIOS wa xla xpalakata kamax'kilh xlkamanan. \v 22 Chu Faraón kalimapeksilh xliputum xpulatamat; "Na kamakapinatit amakgolh laktsu lak kgawasan nak kalgtuchuko wan tiku nalakgachinkgoy, chu na kamakxtakgatit laktsu lak tsuman." \ No newline at end of file diff --git a/02/03.txt b/02/03.txt index 110f9259..4b2cc712 100644 --- a/02/03.txt +++ b/02/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 chu akxni xla ni lay xtimatseka, xla tiyal akgtum pekjxu chu limakslutu lhilhtam chu alistalh mujul skata nak pekjxu chu makalh nak xlakni saket nak xkiltun kgaltuchokgo. \v 4 Chu xtalamakat tayal laki na ukxa wantu na lhaniy. -======= -\v 3 \v 4 3 chu akxni xla ni lay xtimatseka, xla tiyal akgtum pekjxu chu limakslutu lhilhtam chu alistalh mujul skata nak pekjxu chu makalh nak xlakni saket nak xkiltun kgaltuchokgo. 4 Chu xtala makat tayal laki na ukxa wantu na lhaniy. ->>>>>>> 2da33fdf7fd17875d580b64ec96460a6779b8b4b +\v 3 chu akxni xla ni lay xtimatseka, xla tiyal akgtum pekjxu chu limakslutu lhilhtam chu alistalh mujul skata nak pekjxu chu makalh nak xlakni saket nak xkiltun kgaltuchokgo. \v 4 Chu xtalamakat tayal laki na ukxa wantu na lhaniy. \ No newline at end of file diff --git a/02/15.txt b/02/15.txt index 52865def..ad326c41 100644 --- a/02/15.txt +++ b/02/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Akxni kaxmatli faraón uma , faraón makniputu Moisés. Chu Moisés tsalalh nak xlakatin faraón chu tamashtakli nak katiyatni Madián. Anta tawil niku xlakasu xwi aktum xha tapuwashni tashtuna. \v 16 Chu xpalakachiwina DIOS xa lak Madián xgaliy chatujun lakstuman. \v 17 Wa xa minkgolh chu makutukgol chuchut, chu matsamakgolh xpukotni xla xborregos xtlati. -======= -\v 15 \v 16 \v 17 15 Akxni kaxmatli faraón uma , faraón makniputu Moisés. Chu Moisés tsalalh nak xlakatin faraón chu tamashtakli nak katiyatni Madián. Anta tawil niku xlakasu xwi aktum xha tapuwashni tashtuna. 16 Chu xpalakachiwina DIOS xa lak Madián xgaliy kgaltujun xlakstumajan . Wa xa minkgolh chu makutukgol chuchut, chu matsamakgolh xpukotni xla xkalnilo xtlati.17 Chu xmapaswain;''nanin minkol xlenputunkoy chu Moises tialh chu maktayakol ,chu makotnikol xkalnilo ->>>>>>> 2da33fdf7fd17875d580b64ec96460a6779b8b4b +\v 15 Akxni kaxmatli faraón uma , faraón makniputu Moisés. Chu Moisés tsalalh nak xlakatin faraón chu tamashtakli nak katiyatni Madián. Anta tawil niku xlakasu xwi aktum xha tapuwashni tashtuna. \v 16 Chu xpalakachiwina DIOS xa lak Madián xgaliy chatujun lakstuman. \v 17 Wa xa minkgolh chu makutukgol chuchut, chu matsamakgolh xpukotni xla xborregos xtlati. \ No newline at end of file diff --git a/05/01.txt b/05/01.txt index 07a0712e..f04773bc 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 5 \v 1 Alistalh uma tatlawa titaxtul, Moisés chu Aarón lakankgolh Faraón chu wanikgol: " Wa uma wantu PUCHINA, Dios xa lak Israel, wan: Kamakxtakti kin pulataman, laki chuna xlakan na ki lakgachixkuwikgoy nak xa kas'kakni tiyat". \v 2 Faraón wa: "¿ Tiku ama PUCHINA? ¿ Tuku xpalakata nak kaxmata xtachiwin, chu nak kgamakxtakga Israel chu na ta'an? akit ni lakgapasa ama PUCHINA; akit ni kag ti makxtakli Israel". -======= -\c 5 \v 1 Alistalh uma tatlawa titaxtul, Moisés chu Aarón lakankgolh Faraón chu wanikgol: " Wa uma wantu PUCHINA, Dios xa lak Israel, wan: Kakamakxtakti kin pulataman, laki chuna xlakan na ki lakgachixkuwikgoy nak xa kas'kakni tiyat". \v 2 Faraón wa: "¿ Tiku ama PUCHINA? ¿ Tuku xpalakata nak kgaxmata xtachiwin, chu nak kgamakxtakga Israel chu na ta'an? akit ni lakgapasa ama PUCHINA; akit ni kag ti makxtakli Israel". ->>>>>>> 1d9254d656c6605fb67f4ef70a5673aa4342b781 +\c 5 \v 1 Alistalh uma tatlawa titaxtul, Moisés chu Aarón lakankgolh Faraón chu wanikgol: " Wa uma wantu PUCHINA, Dios xa lak Israel, wan: Kakamakxtakti kin pulataman, laki chuna xlakan na ki lakgachixkuwikgoy nak xa kas'kakni tiyat". \v 2 Faraón wa: "¿ Tiku ama PUCHINA? ¿ Tuku xpalakata nak kgaxmata xtachiwin, chu nak kgamakxtakga Israel chu na ta'an? akit ni lakgapasa ama PUCHINA; akit ni kag ti makxtakli Israel". \ No newline at end of file diff --git a/05/03.txt b/05/03.txt index b690f162..5c0d7917 100644 --- a/05/03.txt +++ b/05/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Xlakan wankgolh: "Dios xla Hebreos kin katachiwinitan. Kakilamakxtakui na kanau chu nak tlawanau aktutu kilhtamaku nak xa kaskakni tiyat chu nak lakgachixkuwiyau PUCHINA Dios laki ni na niyau nak xlimakaun kintaratlawanakan". \v 4 Chu xa puxku Egipto kawanilh: ". Moisés chu Aarón ¿ Tuku xpalakata wixinan machokoputunatit xtaskujunkan uma pulutaman? kataspit,tit nak mintaskujut'kan. \v 5 "Nachuna wa: Lanchu lhuwa Hebreos lhamakgolh chu wix machokgopat xtaskujut'kan " -======= -\v 3 \v 4 \v 5 3 Xlakan wankgolh: "Dios xla Hebreos kin katachiwinitan. Kakilamakxtakui na kanau chu nak tlawanau aktutu kilhtamaku nak xa kaskakni tiyat chu nak lakgachixkuwiyau PUCHINA Dios, laki ni na niyau nak xlimakaun kintaratlawanikan". 4 Chu xa puxku Egipto kawanilh: ". Moisés chu Aarón ¿ Tuku xpalakata wixinan machokoputunatit xtaskujunkan uma pulutaman? kataspit,tit nak mintaskujut'kan. 5 "Nachuna wa: Lanchu lhuwa Hebreos lhamakgolh chu wix machokgopatit xtaskujut'kan " ->>>>>>> 1d9254d656c6605fb67f4ef70a5673aa4342b781 +\v 3 Xlakan wankgolh: "Dios xla Hebreos kin katachiwinitan. Kakilamakxtakui na kanau chu nak tlawanau aktutu kilhtamaku nak xa kaskakni tiyat chu nak lakgachixkuwiyau PUCHINA Dios laki ni na niyau nak xlimakaun kintaratlawanakan". \v 4 Chu xa puxku Egipto kawanilh: ". Moisés chu Aarón ¿ Tuku xpalakata wixinan machokoputunatit xtaskujunkan uma pulutaman? kataspit,tit nak mintaskujut'kan. \v 5 "Nachuna wa: Lanchu lhuwa Hebreos lhamakgolh chu wix machokgopat xtaskujut'kan " \ No newline at end of file diff --git a/05/06.txt b/05/06.txt index 651aabce..bc94c55d 100644 --- a/05/06.txt +++ b/05/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Nachuna ama kilhtamaku, Faraón kalimapeksilh xapuxku xlaks'kujni xtachin chu wanti xak'katsiwilkgolh xtaskujut ama pulataman. Chu kawanillh: " \v 7 Chu lanchu, wixinan ne kakamaxitit pulataman wantu na llitlawakoy ladrillo, ka'ankgolh xlakan laki na liminkgoy xmak lakaskinakan. \v 8 Chu wixinan tlak na kas kiniyatit xlakan laxtumata ladrillo wantu xltawakoy pulh. ni na tlawakoy aktsu xpalakata xlakan ne skuj'putunkoy. wa xpalakata xlakan skimakgolh talakaskin na ankgoy lakgachixkuikgoy XDios. \v 9 Kakamaliukinitit xtaskujutkan lakchixkuwen laki xlakan na akstitum na skuj'kgoy chu ni kuenta na tlawakgoy ama tachiwin wantu ni xa kana. -======= -\v 6 \v 7 \v 8 \v 9 6 Nachuna ama kilhtamaku, Faraón kalimapeksilh xapuxku xlaks'kujni tachin chu wanti xak'katsiwilkgolh xtaskujut ama pulataman. Chu kawanillh: 7 " Chu lanchu, wixinan ne kakamaxitit pulataman wantu na llitlawakoy ladrillo, ka'ankgolh xlakan laki na putsakgoy xla skani sakat , xmak lakaskinakan. 8 Chu wixinan tlak na kas kiniyatit xlakan laxtumata ladrillo wantu xltawakoy pulh. ni na tlawakoy aktsu xpalakata xlakan ne skuj'putunkoy. wa xpalakata xlakan skimakgolh talakaskin na ankgoy lakgachixkuikgoy XDios. 9 Kakamaliukinitit xtaskujutkan lakchixkuwen laki xlakan na akstitum na skuj'kgoy chu ni kuenta na tlawakgoy ama tachiwin wantu ni xa kana. ->>>>>>> 1d9254d656c6605fb67f4ef70a5673aa4342b781 +\v 6 Nachuna ama kilhtamaku, Faraón kalimapeksilh xapuxku xlaks'kujni xtachin chu wanti xak'katsiwilkgolh xtaskujut ama pulataman. Chu kawanillh: " \v 7 Chu lanchu, wixinan ne kakamaxitit pulataman wantu na llitlawakoy ladrillo, ka'ankgolh xlakan laki na liminkgoy xmak lakaskinakan. \v 8 Chu wixinan tlak na kas kiniyatit xlakan laxtumata ladrillo wantu xltawakoy pulh. ni na tlawakoy aktsu xpalakata xlakan ne skuj'putunkoy. wa xpalakata xlakan skimakgolh talakaskin na ankgoy lakgachixkuikgoy XDios. \v 9 Kakamaliukinitit xtaskujutkan lakchixkuwen laki xlakan na akstitum na skuj'kgoy chu ni kuenta na tlawakgoy ama tachiwin wantu ni xa kana. \ No newline at end of file diff --git a/05/10.txt b/05/10.txt index a6455365..bf0b5e8f 100644 --- a/05/10.txt +++ b/05/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Chuna chu wanti xmaskujunankgoy tachin chu xmapeksinanin ankgolh wanikgoy pulatam. Chuna wan Faraón: Ne kaj tikakaxi xmalakaskinakan. \v 11 wixinan na pinatit chuna putsayatit anta niku tlan na mak lhayatit, chu wa mintaskujutkan ni kati kalimaktinikantit. -======= -\v 10 \v 11 10 Chuna chu wanti xmaskujunankgoy tachin chu xmapeksinanin ankgolh wanikgoy pulataman. Chuna wan Faraón: Ne kaj tikamaxin xa skagni sakghet. 11 wixinan na pinatit chuna putsayatit anta niku tlan wixa skagni sakghet, chu wa mintaskujutkan ni kati kalimaktinikantit. ->>>>>>> 1d9254d656c6605fb67f4ef70a5673aa4342b781 +\v 10 Chuna chu wanti xmaskujunankgoy tachin chu xmapeksinanin ankgolh wanikgoy pulatam. Chuna wan Faraón: Ne kaj tikakaxi xmalakaskinakan. \v 11 wixinan na pinatit chuna putsayatit anta niku tlan na mak lhayatit, chu wa mintaskujutkan ni kati kalimaktinikantit. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7334f42c..cd12aa76 100644 --- a/manifest.json +++ b/manifest.json @@ -49,13 +49,26 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", + "01-06", + "01-08", + "01-11", + "01-13", + "01-15", + "01-18", + "01-20", "02-title", "02-01", + "02-03", "02-05", "02-07", "02-09", "02-11", "02-13", + "02-15", + "02-18", + "02-21", + "02-23", "03-title", "03-01", "03-04", @@ -78,6 +91,12 @@ "04-27", "04-29", "05-title", + "05-01", + "05-03", + "05-06", + "05-10", + "05-12", + "05-15", "05-19", "05-22", "06-01", @@ -144,15 +163,6 @@ "31-title", "32-title", "33-title", - "34-title", - "02-18", - "02-21", - "02-23", - "05-01", - "05-03", - "05-06", - "05-10", - "05-12", - "05-15" + "34-title" ] } \ No newline at end of file