From 93498841f46dba4f8c886f2f6caf33f63d4c1ab0 Mon Sep 17 00:00:00 2001 From: Abelmon Date: Wed, 13 Jul 2022 16:22:49 -0300 Subject: [PATCH] =?UTF-8?q?Wed=20Jul=2013=202022=2016:22:49=20GMT-0300=20(?= =?UTF-8?q?Hor=C3=A1rio=20Padr=C3=A3o=20de=20Bras=C3=ADlia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 01/01.txt | 6 +----- front/title.txt | 6 +----- manifest.json | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/01/01.txt b/01/01.txt index 5567756..f110a69 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Dji prexbit_la Gaio, ha ki mo kõtã telmã lãdã lavehite. \v 2 Mo fwe, phuie pu u hete benisie lãdã tut bagaj, pu u lãsãte hete pi benisie ãke u nam. \v 3 Mo hete boku kõtã kã fwe-iela hive pu bai temwē dji lavehite, dji kumã u ka maxe lãdã lavehite. \v 4 Mo pa gãiē kõtatmã ki pi gho dji ki sa: kã ga tãde ki pitit_iela ka maxe lãdã lavehite. -======= -\v 1 Dji prexbit_la Gaio, ha ki mo kõtã telmã lãdã lavehite. \v 2 Mo fwe, phuie pu u hete benisie lãdã tut bagaj, pu u lãsãte hete pi benisie ãke u nam. \v 3 Mo hete boku kõtã kã fwe_iela hive pu bai temwē dji lavehite, dji kumã u ka maxe lãdã lavehite. \v 4 Mo pa gãiē kõtatmã ki pi gho dji ki sa: kã ga tãde ki pitit_iela ka maxe lãdã lavehite. ->>>>>>> 04de81b970ce70dcf28bbd04b2ae9ae92b893650 +\c 1 \v 1 Dji prexbit_la Gaio, ha ki mo kõtã telmã lãdã lavehite. \v 2 Mo fwe, phuie pu u hete benisie lãdã tut bagaj, pu u lãsãte hete pi benisie ãke u nam. \v 3 Mo hete boku kõtã kã fwe-iela hive pu bai temwē dji lavehite, dji kumã u ka maxe lãdã lavehite. \v 4 Mo pa gãiē kõtatmã ki pi gho dji ki sa: kã ga tãde ki pitit-iela ka maxe lãdã lavehite. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index ba3c3a9..744caa5 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Thoa zen lét dji Jã -======= -3 John ->>>>>>> 04de81b970ce70dcf28bbd04b2ae9ae92b893650 +Thoa zen lét dji Jã \ No newline at end of file diff --git a/manifest.json b/manifest.json index 32bcd42..a284c11 100644 --- a/manifest.json +++ b/manifest.json @@ -36,7 +36,9 @@ "Abelmon" ], "finished_chunks": [ + "front-title", "01-title", + "01-01", "01-05", "01-09", "01-11",