diff --git a/01/01.txt b/01/01.txt index e76f726..0016b61 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 \v 2 \v 3 the -======= -\c 1 \v 1 Ne bachá kua isirame juba echi Cristo, echi David (Rabi) ranala, echi Abraham ranala. \v 2 Abraham nila rua echi Isaac onala, Isaac onola echi Jacob, Jacob onola echi Judá mina binoi rejimala. \v 3 Judá echi Feres onola miná Zara alí yela Tamar, Fares onola echi Esrom, Esrom onola echi Aram ->>>>>>> 1920347fbb707ebaa84610275f9b7c0cd8b1003e +\c 1 \v 1 Ne bachá kua isirame juba echi Cristo, echi David (Rabi) ranala, echi Abraham ranala. \v 2 Abraham nila rua echi Isaac onala, Isaac onola echi Jacob, Jacob onola echi Judá mina binoi rejimala. \v 3 Judá echi Feres onola miná Zara alí yela Tamar, Fares onola echi Esrom, Esrom onola echi Aram \ No newline at end of file diff --git a/07/03.txt b/07/03.txt index f2a011e..282636a 100644 --- a/07/03.txt +++ b/07/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 \v 4 \v 5 Cabosi nibacha nachi pasi echi binoi busila na echiriga omerama iné echi basai echona busila muje rijimala. -======= -\v 3 ¿ali churikaré we ine yemi echi ta kusu akichekami mapu echi muje rijimala busilachi ati, chopi ketasi kala 'ine echi ne walu kusu mapu yemi aboni busilchi iniwi? \v 4 ¿churika a omeri jeane 'yemi aboni rijimala; 'tami nakiwi mapurika ni mi machi machibulma echi kusu akichemi muje busilachi atíme,' mapali 'yemi achobijí nísa echi ne walu kusu echona aboni busilachi? \v 5 ¡ýemi ne simirra kabosi! bacha machibusi echi ne walu kusu 'yemi busilachi atiame ali echirika ma omerima 'yemi kala i'ne echi ta kusu akichemi 'yemi rijimala busilchi atiame. ->>>>>>> 1920347fbb707ebaa84610275f9b7c0cd8b1003e +\v 3 ¿ali churikaré we ine yemi echi ta kusu akichekami mapu echi muje rijimala busilachi ati, chopi ketasi kala 'ine echi ne walu kusu mapu yemi aboni busilchi iniwi? \v 4 ¿churika a omeri jeane 'yemi aboni rijimala; 'tami nakiwi mapurika ni mi machi machibulma echi kusu akichemi muje busilachi atíme,' mapali 'yemi achobijí nísa echi ne walu kusu echona aboni busilachi? \v 5 ¡ýemi ne simirra kabosi! bacha machibusi echi ne walu kusu 'yemi busilachi atiame ali echirika ma omerima 'yemi kala i'ne echi ta kusu akichemi 'yemi rijimala busilchi atiame. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt new file mode 100644 index 0000000..a3169f4 --- /dev/null +++ b/front/title.txt @@ -0,0 +1 @@ +Mateo \ No newline at end of file diff --git a/manifest.json b/manifest.json index bc4cd15..f913ed9 100644 --- a/manifest.json +++ b/manifest.json @@ -36,46 +36,13 @@ "vianney", "Abraham Castro ", "ENMA", - "michael" + "michael", + "Michael" ], "finished_chunks": [ - "06-title", - "06-01", - "06-03", - "06-05", - "06-08", - "06-11", - "06-14", - "06-16", - "06-19", - "06-22", - "06-25", - "06-27", - "06-30", - "06-32", - "07-06", - "07-07", - "07-11", - "07-13", - "07-15", - "21-06", - "21-09", - "21-12", - "21-15", - "21-18", - "21-20", - "21-23", - "21-25", - "21-28", - "21-31", - "21-33", - "21-35", - "21-38", - "21-40", - "21-42", - "21-43", - "21-45", + "front-title", "01-title", + "01-01", "01-04", "01-07", "01-09", @@ -135,7 +102,28 @@ "05-40", "05-43", "05-46", + "06-title", + "06-01", + "06-03", + "06-05", + "06-08", + "06-11", + "06-14", + "06-16", + "06-19", + "06-22", + "06-25", + "06-27", + "06-30", + "06-32", + "07-title", "07-01", + "07-03", + "07-06", + "07-07", + "07-11", + "07-13", + "07-15", "11-title", "11-01", "11-04", @@ -242,6 +230,35 @@ "19-28", "19-29", "20-01", + "20-03", + "20-05", + "20-08", + "20-11", + "20-13", + "20-15", + "20-17", + "20-20", + "20-22", + "20-25", + "20-29", + "20-32", + "21-06", + "21-09", + "21-12", + "21-15", + "21-18", + "21-20", + "21-23", + "21-25", + "21-28", + "21-31", + "21-33", + "21-35", + "21-38", + "21-40", + "21-42", + "21-43", + "21-45", "22-title", "22-01", "22-04", @@ -262,18 +279,6 @@ "22-41", "22-43", "22-45", - "20-03", - "20-05", - "20-08", - "20-11", - "20-13", - "20-15", - "20-17", - "20-20", - "20-22", - "20-25", - "20-29", - "20-32", "23-01", "23-04", "23-06",