diff --git a/01/01.txt b/01/01.txt index 2199f08..5567756 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1 +1,5 @@ -\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 +<<<<<<< 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 diff --git a/front/title.txt b/front/title.txt index 744caa5..ba3c3a9 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1 +1,5 @@ -Thoa zen lét dji Jã \ No newline at end of file +<<<<<<< HEAD +Thoa zen lét dji Jã +======= +3 John +>>>>>>> 04de81b970ce70dcf28bbd04b2ae9ae92b893650 diff --git a/manifest.json b/manifest.json index a284c11..32bcd42 100644 --- a/manifest.json +++ b/manifest.json @@ -36,9 +36,7 @@ "Abelmon" ], "finished_chunks": [ - "front-title", "01-title", - "01-01", "01-05", "01-09", "01-11",