From f629134159b42a568cbad970ff715f5196c8d932 Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Thu, 21 Jul 2022 23:21:48 -0500 Subject: [PATCH] Thu Jul 21 2022 23:21:48 GMT-0500 (GMT-05:00) --- 01/01.txt | 6 +----- 01/04.txt | 6 +----- manifest.json | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/01/01.txt b/01/01.txt index 49f539d..751d002 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Nejjata petüpae kujinae Moisés, Dioso pija jiwitonü, Dioso barrukuikui jai Josué Num pejjinato. Moisés pija jiwitonü Jumaitsi: \v 2 Moisés, taja jiwitonu, tüpa. Nejjata, nanatapunarre, nikabarre Jordán mene, jjamü yajawa dajita tomara pa ira Israel manoe rajjutajü. \v 3 Jjanü karajutatsi dajjita nakua, jjuaya najetarukaejitsiamü, jjamü karajutatsi dajita nakua, karajutatsi jamü pakuenia jumaitsinü Moisés Jawabelia. -======= -\c 1 \v 1 Nejjata petüpae kujinae Moisés, Dioso pija jiwitonü, Dioso barrakuijai Josué Num pejjinato. Moisés pijajiwitonu Jumaitsi: \v 2 Moisés, taja jiwitonü, tupa. Nejjata, nanatapunare, nikabarre Jordán mene, jjamü yajawa dajita tomara pa ira Israel monae rajutajü. Jjanu Dioso rajutaju, Israel monae. \v 3 Jjanü karajutatsi dajjita nakua, jjuaya najetarukaejitsiamü, jamü karajutatsi dajita nakua, karajutatsi jjamü pakuenia Jumaitsinü Moisés Jawabelia. ->>>>>>> 1cb3bbb32020a84d1ea59e28b83f07a6fd756792 +\c 1 \v 1 Nejjata petüpae kujinae Moisés, Dioso pija jiwitonü, Dioso barrakuijai Josué Num pejjinato. Moisés pijajiwitonu Jumaitsi: \v 2 Moisés, taja jiwitonü, tupa. Nejjata, nanatapunare, nikabarre Jordán mene, jjamü yajawa dajita tomara pa ira Israel monae rajutajü. Jjanu Dioso rajutaju, Israel monae. \v 3 Jjanü karajutatsi dajjita nakua, jjuaya najetarukaejitsiamü, jamü karajutatsi dajita nakua, karajutatsi jjamü pakuenia Jumaitsinü Moisés Jawabelia. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index cdf89d5..600c43b 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Desierto kujinae Líbano jawabelia Éufrates mene jawaberreka, dajjita ira hititas, yajawa Mediterráneo manuamene, jota juameto junua, arajota kopia werewerekaena nija nakuatsane. \v 5 Kaejiwiyo ata apo ka kapanepaetsane dajita matakabi neponuponae epatoyo. Jjanü koyawatsitsane, pakuenía yajawanü Moisés. Apokajjuabitsitsane apokakopatsitsanetsi. -======= -\v 4 Desierto kujinae Líbano jawabelia Eufrates mene jawaberreka, dajjita ira hititas, yajawa Mediterráneo manuamene, jota juameto junua, arajota kopia werewerekaena nija nakuatsane. \v 5 Kaejiwiyo ata apo kakapanepaetsane. Dajjito matakabi neponuponae epatoyo. Jjanü kayajawatsitsane, pakuenia yajawanu Moisés. Apo ka jjuabutsi-tsane, apo kakopatsi tsanetsi. ->>>>>>> 1cb3bbb32020a84d1ea59e28b83f07a6fd756792 +\v 4 Desierto kujinae Líbano jawabelia Eufrates mene jawaberreka, dajjita ira hititas, yajawa Mediterráneo manuamene, jota juameto junua, arajota kopia werewerekaena nija nakuatsane. \v 5 Kaejiwiyo ata apo kakapanepaetsane. Dajjito matakabi neponuponae epatoyo. Jjanü kayajawatsitsane, pakuenia yajawanu Moisés. Apo ka jjuabutsi-tsane, apo kakopatsi tsanetsi. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8e0ac48..93a47c2 100644 --- a/manifest.json +++ b/manifest.json @@ -42,6 +42,8 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", + "01-04", "01-06", "01-08", "01-10",