diff --git a/04/01.txt b/04/01.txt index 2ef353f..1c1b893 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 4 \v 1 Njite lriaji angele cacolri noapía lrino noicaolre lricafietacanoa cayoji aachiasho; lricafieta noa lrioya lriaji notaponia. \v 2 Lricaite norsu: "¿Coca picapalri?" njite noaco: "nocapa apada lámpara iarropoco nanaitanda oirrosho, narroda iapía. Lrirso siete (7) lámpara lrinaco, njite siete lámpara tubusho perri naicaoperri njaji lámpara. \v 3 Yamana jaico olivo shomitsa lríoyana. Aapana aachialriemete shomi lriarroda iuya apana inarruete. -======= -\c 4 \v 1 Nite liaji angel \v 2 kakudali nuapiya \v 3 jlinu jnuikaule ->>>>>>> aa3bf40e00ce2112f222c7fe8f4520ff6daff15e +\c 4 \v 1 Njite lriaji angele cacolri noapía lrino noicaolre lricafietacanoa cayoji aachiasho; lricafieta noa lrioya lriaji notaponia. \v 2 Lricaite norsu: "¿Coca picapalri?" njite noaco: "nocapa apada lámpara iarropoco nanaitanda oirrosho, narroda iapía. Lrirso siete (7) lámpara lrinaco, njite siete lámpara tubusho perri naicaoperri njaji lámpara. \v 3 Yamana jaico olivo shomitsa lríoyana. Aapana aachialriemete shomi lriarroda iuya apana inarruete. \ No newline at end of file diff --git a/05/01.txt b/05/01.txt index 6782ba5..061df98 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 5 \v 1 Nite nusreta nujti,nukapakaa, \v 2 liaji angel liako nosro. -======= -\c 5 \v 1 Nite jnusretaka nuutji, nukapakasru¡ papje papera jnakalapinda yarakau! \v 2 Nite liaku nusru liaji angel: "¿Kuaka pikapa?"jnuepaka". Jnukapaka papje papera jnakalapinda yarakau, ventidos linawatesre liijalipaka panitsupa cuarenta y cuatro metro, nite yamema pakapi inawatesre liwawasriku panitsupa pemakapakapi limaimaka". ->>>>>>> aa3bf40e00ce2112f222c7fe8f4520ff6daff15e +\c 5 \v 1 Nite jnusretaka nuutji, nukapakasru¡ papje papera jnakalapinda yarakau! \v 2 Nite liaku nusru liaji angel: "¿Kuaka pikapa?"jnuepaka". Jnukapaka papje papera jnakalapinda yarakau, ventidos linawatesre liijalipaka panitsupa cuarenta y cuatro metro, nite yamema pakapi inawatesre liwawasriku panitsupa pemakapakapi limaimaka". \ No newline at end of file diff --git a/manifest.json b/manifest.json index b21f653..7a6100b 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "language_id": "es-419", "resource_id": "ulb", "checking_level": "3", - "date_modified": "2023-11-21T17:12:57.0497369+00:00", + "date_modified": "2023-08-14T14:30:22.2617729+00:00", "version": "1.9" } ], @@ -39,7 +39,8 @@ "AnnyLu Moreno", "ninfa tividor", "Mercedes Romero", - "Victor cuiche" + "Victor cuiche", + "Joseeliezerr123" ], "finished_chunks": [ "03-title",