From 2b874a7fc8700068fc87c0354180db30fe72bd29 Mon Sep 17 00:00:00 2001 From: wendyc Date: Sat, 2 Mar 2024 14:42:55 -0400 Subject: [PATCH] Sat Mar 02 2024 14:42:54 GMT-0400 (hora de Bolivia) --- 01/01.txt | 6 +----- manifest.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/01/01.txt b/01/01.txt index b818e28..a6ca4bd 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 \v 2 Conflict Parsing Error -======= -\c 1 \v 1 Kopieya matakabi Dioso itsi itabojjo yajawa ira. \v 2 Ira itsakuena apojjenae. Itakiri nakua irajawata itasa dajjita. Dioso pe jamatabukuene saya nuka najenaejaeba mera jawata. ->>>>>>> 421fe0b0aeb3aaad9946b1845845d14caed99ca6 +\c 1 \v 1 Kopieya matakabi Dioso itsi itabojjo yajawa ira. \v 2 Ira itsakuena apojjenae. Itakiri nakua irajawata itasa dajjita. Dioso pe jamatabukuene saya nuka najenaejaeba mera jawata. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8035cba..4aa73dd 100644 --- a/manifest.json +++ b/manifest.json @@ -43,6 +43,7 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", "01-03", "01-06", "01-09",