diff --git a/04/title.txt b/04/title.txt index ba518b3..c911426 100644 --- a/04/title.txt +++ b/04/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Capitulo 4 -======= -Capítulo 4 ->>>>>>> 5c90dd190e5d6b9a1392bfa56befee2a2f7a4d97 +Capítulo 4 \ No newline at end of file diff --git a/06/title.txt b/06/title.txt index 9aa0f18..f7c354f 100644 --- a/06/title.txt +++ b/06/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Capitulo 6 -======= -Capítulo 6 ->>>>>>> 5c90dd190e5d6b9a1392bfa56befee2a2f7a4d97 +Capítulo 6 \ No newline at end of file diff --git a/09/title.txt b/09/title.txt index c4a3556..cc37d10 100644 --- a/09/title.txt +++ b/09/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Capitulo 9 -======= -Capítulo 9 ->>>>>>> 5c90dd190e5d6b9a1392bfa56befee2a2f7a4d97 +Capítulo 9 \ No newline at end of file diff --git a/16/05.txt b/16/05.txt index 06beab9..1082e82 100644 --- a/16/05.txt +++ b/16/05.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 5 Ya Efraín yedaca yasu weneiwica iriwa iyuwata yanawaca yai abeeri calii imalacateicawa imaquerica Atarot Adar nese, Bet Horón chenibaa \v 6 nese nacawaa napichalewa uni manuiri nere idecuni nere. Mirmetat depuawalee, nacapowaca chabaa Tanat Siló iwalibaa, nachabacawa Janoa nere idecuni. \v 7 Janoa nese nalicuacawa alede Atarot Naarat, caita nadrecawa alede Jericó nere, nanacate Jordán nere idecunii. -======= \v 5 Ya Efraín yedaca yasu weneiwica iriwa - iyuwata yanawaca yai abeeri calii imala cateicawa imaquerica Atarot Adar nese, Bet Horón chenibaa. \v 6 nese nacawaa napichalewa uni manuirii nere idecuni nere Micmetat, depuawalee, nacapowaca chabaa tanat siló iwalibaa, nachabacawa Janoa nere idecuni. \v 7 Janoa nese nalicuacawa alede Atarot, Naarat, caita nadecawa alede Jericó nere, nanacate Jordán nere idecunii. ->>>>>>> 5c90dd190e5d6b9a1392bfa56befee2a2f7a4d97 + iyuwata yanawaca yai abeeri calii imala cateicawa imaquerica Atarot Adar nese, Bet Horón chenibaa. \v 6 nese nacawaa napichalewa uni manuirii nere idecuni nere Micmetat, depuawalee, nacapowaca chabaa tanat siló iwalibaa, nachabacawa Janoa nere idecuni. \v 7 Janoa nese nalicuacawa alede Atarot, Naarat, caita nadecawa alede Jericó nere, nanacate Jordán nere idecunii. \ No newline at end of file diff --git a/16/title.txt b/16/title.txt index 12f37b4..08ebd71 100644 --- a/16/title.txt +++ b/16/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Capitulo 16 -======= -Capítulo 16 ->>>>>>> 5c90dd190e5d6b9a1392bfa56befee2a2f7a4d97 +Capítulo 16 \ No newline at end of file diff --git a/manifest.json b/manifest.json index aca2cdd..8984810 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "language_id": "es-419", "resource_id": "ulb", "checking_level": "3", - "date_modified": "2023-05-11T15:57:58.1691059+00:00", + "date_modified": "2023-02-22T15:56:51.846685+00:00", "version": "1.9" } ], @@ -40,7 +40,8 @@ "robykruger", "KEILA", "Gabrielsanchez", - "Juan_HRomeroC" + "Juan_HRomeroC", + "wendyc" ], "finished_chunks": [ "front-title",