diff --git a/01/01.txt b/01/01.txt index 16ecf95..7aaf72c 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 uchi antes u kiinmi moisese,u palitzil le kichkeleyuun, kichkeleyuun dtanne ti josue u pali nun,u ayudante u noochi moisese,ku yalik. \v 2 moisese, y palitzil, kimeem.uix u patalee, likeen, manem jordan, tech yete tu lakloo cajal, te lunmo tene ki dzictech,the u cajilo israel. \v 3 tene ki dziktexe cada cajo tuux le planta uh yock ki yachetik.ten dziktech,igual ki prometertitech moisese. -======= -\v 1 \v 2 \v 3 josue 1.1-3 -1-uchi antes u kiinmi moisese,u palitzil le kichkeleyuun,kichkeleyuun dtanne ti josue u pali nun,u ayudante u noochi moisese,ku yalik.2-moisese,y palitzil,kimeem.uix u patalee,likeen,manem jordan,tech yete tu lakloo cajal,te lunmo tene ki dzictech,the u cajilo israel.3-tene ki dziktexe cada cajo tuux le planta uh yock ki yachetik.ten dziktech,igual ki prometertitech moisese. ->>>>>>> 48fc0afe379d961f90a1bc362e178afb3b4a7ac1 +\c 1 \v 1 uchi antes u kiinmi moisese,u palitzil le kichkeleyuun, kichkeleyuun dtanne ti josue u pali nun,u ayudante u noochi moisese,ku yalik. \v 2 moisese, y palitzil, kimeem.uix u patalee, likeen, manem jordan, tech yete tu lakloo cajal, te lunmo tene ki dzictech,the u cajilo israel. \v 3 tene ki dziktexe cada cajo tuux le planta uh yock ki yachetik.ten dziktech,igual ki prometertitech moisese. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index 2aa1ef9..29925f9 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 tushi mi naan pakal yetel le libano naach yetel le nojoch ja o eufrates tu laka le lumo yetel le hititas o jaal ja mediterraneo, tu yemle kino,tu kala le lu,mo. \v 5 mu kat putsli yula ku matu mul pactuvao yetel tu lakal lekino a kushta.tianesh ti wik naale natsen ti moises. maa ti paatech maa ti tuskes. -======= -\v 5 V\v 4 tushi mi naan pakal yetel le Líbano naach yetel le nojoch ja o Éufrates tu laka le lumo yetel le Hititas o jaal ja Mediterráneo se,tu yemle kino,tu kala le lu,mo.5mu kat putsli yula ku matu mul pactuvao yetel tu lakal lekino a kushta.tianesh ti wik naale natsen ti moises. maa ti paatech maa ti tuskes. ->>>>>>> 9ea635172891c6b7da11fb22f0cf980e615d6a04 +\v 4 tushi mi naan pakal yetel le libano naach yetel le nojoch ja o eufrates tu laka le lumo yetel le hititas o jaal ja mediterraneo, tu yemle kino,tu kala le lu,mo. \v 5 mu kat putsli yula ku matu mul pactuvao yetel tu lakal lekino a kushta.tianesh ti wik naale natsen ti moises. maa ti paatech maa ti tuskes. \ No newline at end of file diff --git a/01/06.txt b/01/06.txt index 313018f..9626798 100644 --- a/01/06.txt +++ b/01/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 \v ANAC AMUC YE TE VALIENTE LLEVO CA ERREDACTIC LE TERRENO LE TI PROMETERTICH LE UCHIC \v 7 ANAC A MUC YETE VALIENTES OVEDECER LE LEY LE TIA TECH LE NOOCH CHI LE TIA LETCHS MA ZHELE MICH TUS TOC CA ZHI KECH YALA KA ZHICTE MALO -======= -\v 6 \v 7 7 tzaá mugü jach tzaa w'oo teche tza a wool a vet tu lacle leyebo jesch y muyjul moisese tiaá ti tech ma vin mish ta tzik, mish ta noo, yola ka shick tech utz tux ka vin. ->>>>>>> 13fbc4eb10a68878f2bee840716d7da877c7f017 +\v 6 \v ANAC AMUC YE TE VALIENTE LLEVO CA ERREDACTIC LE TERRENO LE TI PROMETERTICH LE UCHIC \v 7 ANAC A MUC YETE VALIENTES OVEDECER LE LEY LE TIA TECH LE NOOCH CHI LE TIA LETCHS MA ZHELE MICH TUS TOC CA ZHI KECH YALA KA ZHICTE MALO \ No newline at end of file diff --git a/01/10.txt b/01/10.txt index 1d02dd4..b2b55cd 100644 --- a/01/10.txt +++ b/01/10.txt @@ -1,10 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\v 10 le tene,josue tu urderta ti u liderobee caja \v 11 ka xikeex te canpamento le cajo ca ordenartak te cajo prepararteex jana tumen te axvekina ya nu crusarcon jordan,yan yoclou yo lumincobel le lumo y ualk ti dios tu dziktex u yumil.olando y alisson * -======= -\v 10 le tene, Josue tu orderta tí u liderobeé caja 11\v 11 kanxikeéx te campamento le cajo ca ordenartak te cajo prepararteex jana, tu mén te oxvekina ya nu crusarcon Jordan, yan yoclou yu lu lumincobe le lumon y vaik tí kichkelenyun tu dziktex u yumil. ->>>>>>> 13fbc4eb10a68878f2bee840716d7da877c7f017 -======= -\v 10 \v 11 josue 1.10-11 -10-le tene,josue tu urderta ti u liderobee caja11- ka xikeex te canpamento le cajo ca ordenartak te cajo prepararteex jana tumen te axvekina ya nu crusarcon jordan,yan yoclou yo KICHKELEYUM le lumo y ualk ti DIOS tu dziktex u yumil.\f + \ft rolando y alisson \f* ->>>>>>> 48fc0afe379d961f90a1bc362e178afb3b4a7ac1 +\v 10 le tene,josue tu urderta ti u liderobee caja \v 11 ka xikeex te canpamento le cajo ca ordenartak te cajo prepararteex jana tumen te axvekina ya nu crusarcon jordan,yan yoclou yo lumincobel le lumo y ualk ti dios tu dziktex u yumil.olando y alisson * \ No newline at end of file diff --git a/01/12.txt b/01/12.txt index 6279586..5bff63f 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1,10 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -\v 12 le rubenitazo yetel gaditase yetel tancoche tribu manasese ,josue tu yale \v 13 kakunche eh dzibo tia moises,u yuntzil kichkeleyun, tu ordenarta tu yala catu yala ti kichkeleyumen tu dzikt u tuben yool le ti dzik le lumo. -======= -\v 12 le rubenitazo yetel gaditase yetel tankoche tribu manases, Josue tu yale. \v 13 13 kakunxex en dzibu tía moises u yuntzil kichkelenyun, tu ordenarta tuobé catu yala tí kichquiliyumen tu dzikt u tuben yool leti dzik le lumo ->>>>>>> 13fbc4eb10a68878f2bee840716d7da877c7f017 -======= -\v 12 \v 13 \ josue 1.12.13 -12-le rubenitazo yetel gaditase yetel tancoche tribu Manasese,Josue tu yale13-kakunche eh dzibo tia Moises,u yuntzil kichkeleyun,tu ordenarta tu yala catu yala ti kichkeleyumen tu le DIOSO dzikt u tuben yool le ti dzik le lumo. ->>>>>>> 48fc0afe379d961f90a1bc362e178afb3b4a7ac1 +\v 12 le rubenitazo yetel gaditase yetel tancoche tribu manasese ,josue tu yale \v 13 kakunche eh dzibo tia moises,u yuntzil kichkeleyun, tu ordenarta tu yala catu yala ti kichkeleyumen tu dzikt u tuben yool le ti dzik le lumo. \ No newline at end of file diff --git a/01/14.txt b/01/14.txt index 036192a..35acb16 100644 --- a/01/14.txt +++ b/01/14.txt @@ -1 +1 @@ -14 U yatan yete u hijos ye tele huacacach ku patalo te luun le pat tio men Moises te patio te rio Jordan. Pero le macovo yan nu vino yet u zucuun y ya nu yan talo, 15 hasta u zhaval un Jescuva tia a sucuun jes tu zahaik ti tech. le tiove ve shan un yumi le lumo. le nojoch tato ku zhic ti kicn que le yun ku zhich ti an te chee ka sut ta terreno tech u yuminen. le luun tuch si tech men le yumo le yashon tu shatecho mene yumo naach to carnajech te rio Jordan tuush ku Jokle kin tiale Moises. \ No newline at end of file +\v 14 U yatan yete u hijos ye tele huacacach ku patalo te luun le pat tio men Moises te patio te rio Jordan. Pero le macovo yan nu vino yet u zucuun y ya nu yan talo, \v 15 hasta u zhaval un Jescuva tia a sucuun jes tu zahaik ti tech. le tiove ve shan un yumi le lumo. le nojoch tato ku zhic ti kicn que le yun ku zhich ti an te chee ka sut ta terreno tech u yuminen. le luun tuch si tech men le yumo le yashon tu shatecho mene yumo naach to carnajech te rio Jordan tuush ku Jokle kin tiale Moises. \ No newline at end of file diff --git a/01/16.txt b/01/16.txt index 2b33798..c54ce8e 100644 --- a/01/16.txt +++ b/01/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 kunu'ko ti josue ka tu yaloo,tu laka lu ka ordendo yan vetik,je tushe ka tushta,je vine. \v 17 yan obedecetik vey tun obedecertik moises.chen le yun tzilo tianech ta wik nale vey anchaji yetel moises. \v 18 je mashe ma tu mentik je vash ka walik ko ya nu kimi.chen ya na muk maa sajquechi -======= -\v 16 \v 17 \v 18 16ta kunu'ko ti Josué ka tu yaloo,tu laka lu ka ordendo yan vetik,je tushe ka tushta,je vine.17yan obedecetik vey tun obedecertik Moises.chen le YUn tzilo tianech ta wik nale vey anchaji yetel Moises.18je mashe ma tu mentik je vash ka walik ko ya nu kimi.chen ya na muk maa sajquechi ->>>>>>> 9ea635172891c6b7da11fb22f0cf980e615d6a04 +\v 16 kunu'ko ti josue ka tu yaloo,tu laka lu ka ordendo yan vetik,je tushe ka tushta,je vine. \v 17 yan obedecetik vey tun obedecertik moises.chen le yun tzilo tianech ta wik nale vey anchaji yetel moises. \v 18 je mashe ma tu mentik je vash ka walik ko ya nu kimi.chen ya na muk maa sajquechi \ No newline at end of file diff --git a/02/15.txt b/02/15.txt index e9c486e..9a809eb 100644 --- a/02/15.txt +++ b/02/15.txt @@ -1,2 +1 @@ -\v 15 \v 16 \v 17 josue 2.15-17 -15-le tene tu yensa te entanao ku utilizartik un pel cuerda u yotoch tu ux cajab ventan yetel muroo te cajoboo.16-leti obe yajo xenex te muntanau y takabaex te max ku persesurcono ya nu castalo y taka baex tres dias yetel le perseguidoresobo dzu zuto,despuese.17-le mako tu yalo ti leti tonexe cumplirta un pe promesa ka ti uhualati que teche ta jurarta uhuata vetik igua. \ No newline at end of file +\v 15 \v 16 \v 17 josue 2.15-le tene tu yensa te entanao ku utilizartik un pel cuerda u yotoch tu ux cajab ventan yetel muroo te cajoboo.\v16 leti obe yajo xenex te muntanau y takabaex te max ku persesurcono ya nu castalo y taka baex tres dias yetel le perseguidoresobo dzu zuto,despuese. \v17 le mako tu yalo ti leti tonexe cumplirta un pe promesa ka ti uhualati que teche ta jurarta uhuata vetik igua. \ No newline at end of file diff --git a/manifest.json b/manifest.json index abf887d..2eba0e5 100644 --- a/manifest.json +++ b/manifest.json @@ -39,22 +39,41 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", + "01-04", + "01-06", "01-08", + "01-10", + "01-12", + "01-14", + "01-16", "02-title", "03-title", "03-01", "03-02", "03-05", "03-07", + "03-09", "03-12", "03-14", "03-17", "04-title", "04-01", + "04-06", + "04-15", + "04-17", + "04-19", + "04-22", "05-title", + "05-04", "06-title", "07-title", + "07-13", "08-title", + "08-29", + "08-30", + "08-33", + "08-34", "09-title", "10-title", "11-title", @@ -70,18 +89,6 @@ "21-title", "22-title", "23-title", - "24-title", - "03-09", - "04-15", - "04-06", - "04-17", - "04-19", - "04-22", - "07-13", - "05-04", - "08-29", - "08-30", - "08-33", - "08-34" + "24-title" ] } \ No newline at end of file