From fc9768e23ba0520cc66729c1c6e5509e949e7d5f Mon Sep 17 00:00:00 2001 From: mitikiwostky Date: Thu, 12 Apr 2018 13:44:42 -0400 Subject: [PATCH] Thu Apr 12 2018 13:44:42 GMT-0400 (SA Western Standard Time) --- 04/01.txt | 5 ----- 04/04.txt | 2 +- 04/06.txt | 2 +- 04/08.txt | 2 +- 04/11.txt | 2 +- 04/title.txt | 6 +----- manifest.json | 4 ++++ 7 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 04/01.txt diff --git a/04/01.txt b/04/01.txt deleted file mode 100644 index 684f6a4..0000000 --- a/04/01.txt +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -\v 1 \v 2 \v 3 Kerá neiká kakaku a+m+ aix+ tekateyu xaxat+a? Haxa xetey+k+h+awek+ xe iyari'tsie ya xekatey+a a+m+ xeh+k+te xeteyukuinit+at+? Xeme tita xekatehexeiya'tsie xemauhewe'erie xeme xeteyukukuya xete +weiya tita xeka te hexeiya. xeme xeyukuit+we xeyutate at+, xeme xekatehexeiya Kaka+yari xekateha wawiriwak+. Xeme xetewawa xe kuatehaunpine, tsiti aneneme xetewawak+, me itax+t+anike tita kuiepa timieme'tsie. -======= -\v 1 \v 2 \v 3 Kerá neiká kakaku a+m+ aix+ tekateyu xaxat+a? Haxa xetex+k+h+awek+ xe iyari'tsie ya xekatey+a a+m+ xeh+k+ate ->>>>>>> branch 'master' of git@git.door43.org:Santiago/hch-x-huicholeste_jas_text_reg.git diff --git a/04/04.txt b/04/04.txt index 782dc2c..3052444 100644 --- a/04/04.txt +++ b/04/04.txt @@ -1 +1 @@ -\v 4 \v 5 Xeme xex+rikit+ka xeme xekuate hakumate nake'eriya kuipa timieme Kaka+yari enemigoya kanih+k+t+ni. Ya'i kename ik+ ut+árika yak+ maine, m+k+ Espíritu ta'hetsie mu katseist+, ta'hetsie muyeyeikanik+ wa+kawa kaneu +tetsaka wa+kawa tatseuye h+wak+. \ No newline at end of file +\v 4 Xeme xex+rikit+ka xeme xekuate hakumate nake'eriya kuipa timieme Kaka+yari enemigoya kanih+k+t+ni. \v 5 Ya'i kename ik+ ut+árika yak+ maine, m+k+ Espíritu ta'hetsie mu katseist+, ta'hetsie muyeyeikanik+ wa+kawa kaneu +tetsaka wa+kawa tatseuye h+wak+. \ No newline at end of file diff --git a/04/06.txt b/04/06.txt index e495df2..898d64e 100644 --- a/04/06.txt +++ b/04/06.txt @@ -1 +1 @@ -\v 6 \v 7 Kaka+yari maxi wa+ká gracia tatsipit+a, pa+na tsiere ut+árika pa+maine: "Kaka+yari kaniwanewieka me mauy+'+t+ka hats+a, gracia pipit+a ke pai ka hauyu'+". Ya umiemek+, Kaka+yari'tsie xekenaka+ka. kahauyumarie xenenewieka, kaniyutaunam+k+ xehetsie. \ No newline at end of file +\v 6 Kaka+yari maxi wa+ká gracia tatsipit+a, pa+na tsiere ut+árika pa+maine: "Kaka+yari kaniwanewieka me mauy+'+t+ka hats+a, gracia pipit+a ke pai ka hauyu'+". \v 7 Ya umiemek+, Kaka+yari'tsie xekenaka+ka. kahauyumarie xenenewieka, kaniyutaunam+k+ xehetsie. \ No newline at end of file diff --git a/04/08.txt b/04/08.txt index b4e95b0..5238999 100644 --- a/04/08.txt +++ b/04/08.txt @@ -1 +1 @@ -\v 8 \v 9 \v 10 Xenak+kani hura Kaka+yari'hats+a, xehats+a hura kani yeyeim+k+. xemamate xeneitieka, xeme xex+rikit+ka, xe'iyari xeneitieka, xeme aix+'xekateuiwawie. Xeney+h+aweni xeutihiwat+, xeutitsuat+! Xenanai xenayeit+a tsuari hiwari temawierika h+awiya. Kaka+yari hats+a xekeneyek+kani xetitunumaut+ m+k+ kaxenaunku hapam+k+. \ No newline at end of file +\v 8 Xenak+kani hura Kaka+yari'hats+a, xehats+a hura kani yeyeim+k+. xemamate xeneitieka, xeme xex+rikit+ka, xe'iyari xeneitieka, xeme aix+'xekateuiwawie. \v 9 Xeney+h+aweni xeutihiwat+, xeutitsuat+! Xenanai xenayeit+a tsuari hiwari temawierika h+awiya. \v 10 Kaka+yari hats+a xekeneyek+kani xetitunumaut+ m+k+ kaxenaunku hapam+k+. \ No newline at end of file diff --git a/04/11.txt b/04/11.txt index 62ef37f..1b67a3f 100644 --- a/04/11.txt +++ b/04/11.txt @@ -1 +1 @@ -\v 11 \v 12 Tsixe kwateyu tamamatekeni xeyunait+ iwamarixi. X+ka tewi yu'iwá hetsiemieme hetsiemieme tutaxata ya'í x+ka ya'iwá ukaxeiyat+ani, ta'Kaka+yari N+arieya pa+na n+ari ka eniet+ kaniy+aneni. X+ka ek+maxi wa+ká perayeaxe pera eriwani ken+ari n+ari kerauku uxa m+k+ yakwatikamie, p+ta it+kame pekanayu yeit+ani. Xeit+ xeik+a kaniuweni n+ari tiyu pa+rit+wat+ pa+na its+kame, m+k+ Kaka+yari kanih+k+t+ni m+k+ kataniuta wikweist+aweni pa+na tatsita unawe, ek+ keane pep+h+k+ 'amare haxa petiyemate? \ No newline at end of file +\v 11 Tsixe kwateyu tamamatekeni xeyunait+ iwamarixi. X+ka tewi yu'iwá hetsiemieme hetsiemieme tutaxata ya'í x+ka ya'iwá ukaxeiyat+ani, ta'Kaka+yari N+arieya pa+na n+ari ka eniet+ kaniy+aneni. X+ka ek+maxi wa+ká perayeaxe pera eriwani ken+ari n+ari kerauku uxa m+k+ yakwatikamie, p+ta it+kame pekanayu yeit+ani. \v 12 Xeit+ xeik+a kaniuweni n+ari tiyu pa+rit+wat+ pa+na its+kame, m+k+ Kaka+yari kanih+k+t+ni m+k+ kataniuta wikweist+aweni pa+na tatsita unawe, ek+ keane pep+h+k+ 'amare haxa petiyemate? \ No newline at end of file diff --git a/04/title.txt b/04/title.txt index 4b8b9dd..c911426 100644 --- a/04/title.txt +++ b/04/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Capìtulo 4 -======= -Capítulo 4 ->>>>>>> branch 'master' of git@git.door43.org:Santiago/hch-x-huicholeste_jas_text_reg.git +Capítulo 4 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 43f1b2b..bdb6e1c 100644 --- a/manifest.json +++ b/manifest.json @@ -73,6 +73,10 @@ "03-13", "03-15", "04-title", + "04-04", + "04-06", + "04-08", + "04-11", "05-title", "05-01", "05-04",