diff --git a/30/07.txt b/30/07.txt index 56407e9e..caad4fb3 100644 --- a/30/07.txt +++ b/30/07.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 7 Aarón xlilhkuyut limajinin tuntlan muksun tsisa, tsisa. xlilhkuyut akxni nakalak'kaxwaliy limakskgon. \v 8 Akxni Aarón nakamapasiy limakskon akan natsiswampalay, xlilhkuyut nawan limajinin anta nak pulakgatakilhputan xla limajinin. Wa uma xlilhkut nawan ankgalhin nak kilakatin, wa PUCHINA, xli putum la mimakgocha militalakgapasni xalak minkachikin. \v 9 Wampi wa wixinin -======= -\v 7 \v 8 \v 9 v. 7 Aarón xlilhkuyut limajinin tuntlan muksun tsisa, tsisa. xlilhkuyut akxni nakalak'kaxwaliy limakskgon. -v.8 Akxni Aarón nakamapasiy limakskon akan natsiswampalay, xlilhkuyut nawan limajinin anta nak pulakgatakilhputan xla limajinin. Wa uma xlilhkut nawan ankgalhin nak kilakatin, wa PUCHINA, xli putum la mimakgocha militalakgapasni xalak minkachikin. -v.9 Wampi wixinin ni namastayatit nimpala aktum limajinin nak pulaktakilhputan xla limajinin, nimpala aktum likakni xalhkuni nimpala likakni xla talhtsi. Ni nakxtakgawakaya nimpal aktum likakni likgotnu nak xokspun. ->>>>>>> 367142203abf6bac95fdae33e7cca89aa1fe5eb1 +\v 7 Aarón xlilhkuyut limajinin tuntlan muksun tsisa, tsisa. xlilhkuyut akxni nakalak'kaxwaliy limakskgon.\v 8 Akxni Aarón nakamapasiy limakskon akan natsiswampalay, xlilhkuyut nawan limajinin anta nak pulakgatakilhputan xla limajinin. Wa uma xlilhkut nawan ankgalhin nak kilakatin, wa PUCHINA, xli putum la mimakgocha militalakgapasni xalak minkachikin.\v 9 Wampi wixinin ni namastayatit nimpala aktum limajinin nak pulaktakilhputan xla limajinin, nimpala aktum likakni xalhkuni nimpala likakni xla talhtsi. Ni nakxtakgawakaya nimpal aktum likakni likgotnu nak xokspun. diff --git a/37/title.txt b/37/title.txt new file mode 100644 index 00000000..d2738df1 --- /dev/null +++ b/37/title.txt @@ -0,0 +1 @@ +Capítulo 37 \ No newline at end of file diff --git a/38/09.txt b/38/09.txt index 4e9aa415..643ba2a2 100644 --- a/38/09.txt +++ b/38/09.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD -\v 9 \v 10 Xla na kaxtlawalh xkilhtin. Lilakgatlapán xapakalhu xatsatata lhakat li tlawalh, akgtumciento makxpan xlilhman. 10 wa ama laktlanka lhakat lilakgatlapan xkgalhi kampuxam xatalyaw, nachuna kampuxam xlaktey xa chuchokgo likan . Xkgalhikgoy kgalhxtokget amakgolh talyaw, na chuná laklasasa likan xaplata. -======= \v 9 na chuna tikaxtlawalh nak kilhtin . xapakalhu xatsatata lhakat , aktumciento makxpan xlilhman. \v 10 wa ama laktlanka lhakat lilakagatlapan xkgalhi kampuxam kiwi, nachuna kampuxam xlakyokanit chuchokgo likan .na chuna xkalilakaxtukuyokanit kalhxtokget chu wa likan xaplata. ->>>>>>> 72f2b9d0be0730000b372bec17e1f017ea26fb84 + diff --git a/38/11.txt b/38/11.txt index 630b608c..37a93c8d 100644 --- a/38/11.txt +++ b/38/11.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD -\v 11 \v 12 11 Na chuna, nak xapaxktu xmawakanit tlanka lhakat xa akgtumciento makxpan xlilhman chu kgampuxam talayaw ,kgampuxam xlaktey xa chuchokgo likan , umakgolh talyaw xkgalhikgoy kalhxtokget, chu laklasasa likan xaplata. 12 anta ni xlitsankgan chichini xwaka lhakat xa itatciento makxpan xlihman xkgali kgankaw talayaw chu xputay . Xkgalhxtokget chu xlaklasasa likan amakgolh talyaw xaplata xwanit . -======= \v 11 na chuna nak xapaxktu xmawakanit tlanka lhakat xa akgtumciento makxpan xilhman chu kampuxam kiwi xlakgyokanit chuchokgo likan , nachuna lilakaxtukuyokanit kalhxtokget chu likan xaplata. \v 12 anta ni sankay chichini xwaka lhakat itatciento makxpan xlihman xkgali kgankay kiwi chu xputay . wantu xkalilakaxtukuyokanit kahlxtokget chu likan xaplata xwan . ->>>>>>> 72f2b9d0be0730000b372bec17e1f017ea26fb84 + diff --git a/manifest.json b/manifest.json index 26005466..3bff776d 100644 --- a/manifest.json +++ b/manifest.json @@ -427,6 +427,7 @@ "36-05", "36-08", "36-11", + "37-title", "37-01", "37-04", "37-07",