From dba9273d0c544012f29fa09dd10ebf7672aa0125 Mon Sep 17 00:00:00 2001 From: sabino Date: Sun, 20 Jun 2021 09:53:43 +0200 Subject: [PATCH] =?UTF-8?q?Sun=20Jun=2020=202021=2009:53:42=20GMT+0200=20(?= =?UTF-8?q?Hora=20da=20=C3=81frica=20do=20Sul)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 01/01.txt | 6 +----- 01/title.txt | 6 +----- manifest.json | 18 +++++++++++------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/01/01.txt b/01/01.txt index 69f3ac0..72e8934 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 \v 2 \v 3 Iwe, lewa na vingafunikile na kafunzilo kabwino. Azimuna akulu afunika akhale wakufuni -======= -\c 1 \v 1 Paulo,Nhabassa wa Mulungu,Ntumiki Wa Yesu Kristu,Ninga mwachikhulupiriro cha hosankhuliwa wa Mulungu na kudziwa chaikochaiko,chilingati cha ,chipephelelo. \v 2 Pakudhikhilila moyo osamala, kwa Mulungu wakusaya kunama,anadziwisa vikalibe vayamba pha nthawi venzekalibe kuyamba. \v 3 pa nthawe ya iye hekha,anaonesa falawake mwakulalikila,ninga mwanani chengetela ine,ninga mwa lamulo ya pulumusi waise Mulungu. ->>>>>>> 735360962bd4c62d891a88f1eeba6d081e3b5e79 +\c 1 \v 1 Paulo,Nhabassa wa Mulungu,Ntumiki Wa Yesu Kristu,Ninga mwachikhulupiriro cha hosankhuliwa wa Mulungu na kudziwa chaikochaiko,chilingati cha ,chipephelelo. \v 2 Pakudhikhilila moyo osamala, kwa Mulungu wakusaya kunama,anadziwisa vikalibe vayamba pha nthawi venzekalibe kuyamba. \v 3 pa nthawe ya iye hekha,anaonesa falawake mwakulalikila,ninga mwanani chengetela ine,ninga mwa lamulo ya pulumusi waise Mulungu. \ No newline at end of file diff --git a/01/title.txt b/01/title.txt index c82c57b..6682e02 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Ndime 2 -======= -Ndime, 1 ->>>>>>> 735360962bd4c62d891a88f1eeba6d081e3b5e79 +Ndime, 1 \ No newline at end of file diff --git a/manifest.json b/manifest.json index f594427..386b25d 100644 --- a/manifest.json +++ b/manifest.json @@ -45,22 +45,26 @@ "Machupa Aquissone", "Saminho Josse", "Salari Bonifacio", - "Reneassi Sandrasse" + "Reneassi Sandrasse", + "Marcio Jose Donizeti Sabino" ], "finished_chunks": [ "front-title", - "02-03", - "02-06", - "02-09", - "02-11", - "02-14", - "02-15", + "01-title", + "01-01", + "01-04", "01-06", "01-08", "01-10", "01-12", "01-14", "01-15", + "02-03", + "02-06", + "02-09", + "02-11", + "02-14", + "02-15", "03-title", "03-01", "03-03",