From 76f08ceade4018939ea76d2d26b8ae260037b961 Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Thu, 8 Jul 2021 12:10:32 -0400 Subject: [PATCH] Thu Jul 08 2021 12:10:31 GMT-0400 (Eastern Daylight Time) --- 04/06.txt | 6 +----- 04/08.txt | 7 +------ manifest.json | 3 +++ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/04/06.txt b/04/06.txt index 2c4a259..5b1abbe 100644 --- a/04/06.txt +++ b/04/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Jipi, rijimala, nije echiriga uchakini jena ni bacha nije binoi jiti ali echi Apolosi pi ala ni'ima yemi yuga, mapuriga tamuje ayenacho yemi omerama binea echiriga aniwami:" ke simi minabi echona mapuriga osoruta ati." jena ju ke bile yemi nisa we nochili echi jare yuga ali auche bile yuga. \v 7 Echi ¿ chika ine bile su'una ni'ira yemi yuga ali auche jare? ¿ piri niwi yemi mapuriga ke narema ke natekuami? ayena yemi echiriga nareli ke natetaga,¿ churikare yemi echiriga nochi mapuriga binoi narela.? -======= -6-\v 6 Jipi, rijimala, nije echiriga uchakini jena ni bacha nije binoi jiti ali echi Apolosi pi ala ni'ima yemi yuga, mapuriga tamuje ayenacho yemi omerama binea echiriga aniwami:" ke simi minabi echona mapuriga osoruta ati." jena ju ke bile yemi nisa we nochili echi jare yuga ali auche bile yuga.7\v 7 -Echi ¿ chika ine bile su'una ni'ira yemi yuga ali auche jare? ¿ piri niwi yemi mapuriga ke narema ke natekuami? ayena yemi echiriga nareli ke natetaga,¿ churikare yemi echiriga nochi mapuriga aboni ola'la ni'ira? ->>>>>>> 1b12df19405d16fce10090c6b17ebc9352b356de +\v 6 Jipi, rijimala, nije echiriga uchakini jena ni bacha nije binoi jiti ali echi Apolosi pi ala ni'ima yemi yuga, mapuriga tamuje ayenacho yemi omerama binea echiriga aniwami:" ke simi minabi echona mapuriga osoruta ati." jena ju ke bile yemi nisa we nochili echi jare yuga ali auche bile yuga. \v 7 Echi ¿ chika ine bile su'una ni'ira yemi yuga ali auche jare? ¿ piri niwi yemi mapuriga ke narema ke natekuami? ayena yemi echiriga nareli ke natetaga,¿ churikare yemi echiriga nochi mapuriga binoi narela.? \ No newline at end of file diff --git a/04/08.txt b/04/08.txt index 0e4ba22..53ca5a8 100644 --- a/04/08.txt +++ b/04/08.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 8 ¡ Ma yemi niwi karika mapu iri naki!¡Ma yemi ju we niwami! yemi owinali echona nula- ali echi ni walu ju tamuje yuga! echi yuga nije echiriga naki nulasani,ali echiriga tamuje nulaboti yemi yuga. \v 9 Nijekala natini echi Riosi echiriga ni muchuwali mapuriga nawesami echiga binerima echali jubami echiriga inarami ali mapuriga echi ralamuli kowiruami. tamuje echiriga isiliti bile ni'ira inerami jenai kawichi ayenacho echi Angeles jiti ali ayenacho echi jenai kawichi pireami. -======= -\v 8 \v 9 8-¡ Ma yemi niwi karika mapu iri naki!¡Ma yemi ju we niwami! yemi owinali echona nula- ali echi ni walu ju tamuje yuga! echi yuga nije echiriga naki nulasani,ali echiriga tamuje nulaboti yemi yuga.9-Nijekala natini echi Riosi echiriga ni muchuwali mapuriga nawesami echiga binerima echali jubami echiriga inarami ali mapuriga echi ralamuli kowiruami. tamuje echiriga isiliti bile ni'ira inerami -jenai kawichi ayenacho echi pionala echi Riosi jiti ali ayenacho echi jenai kawichi pireami. ->>>>>>> 1b12df19405d16fce10090c6b17ebc9352b356de +\v 8 ¡ Ma yemi niwi karika mapu iri naki!¡Ma yemi ju we niwami! yemi owinali echona nula- ali echi ni walu ju tamuje yuga! echi yuga nije echiriga naki nulasani,ali echiriga tamuje nulaboti yemi yuga. \v 9 Nijekala natini echi Riosi echiriga ni muchuwali mapuriga nawesami echiga binerima echali jubami echiriga inarami ali mapuriga echi ralamuli kowiruami. tamuje echiriga isiliti bile ni'ira inerami jenai kawichi ayenacho echi Angeles jiti ali ayenacho echi jenai kawichi pireami. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7d43804..da0fee5 100644 --- a/manifest.json +++ b/manifest.json @@ -67,6 +67,9 @@ "04-01", "04-03", "04-05", + "04-06", + "04-08", + "04-10", "05-title", "06-01", "06-04",