From 25ee51b69eb685ef6cb8c0f8ede99652a2d46353 Mon Sep 17 00:00:00 2001 From: MapaloSwazi Date: Tue, 29 Sep 2020 14:01:54 +0200 Subject: [PATCH] Tue Sep 29 2020 14:01:54 GMT+0200 (South Africa Standard Time) --- 05/26.txt | 6 +----- manifest.json | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/05/26.txt b/05/26.txt index f8b5ad8..2b4cb8a 100644 --- a/05/26.txt +++ b/05/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Ngako ke siphatsimandla selitempeli sahamba kanye netisebenti, bababuyisa emuva, ngaphandle kwekubaphocelela, ngoba bebasaba kutsi bangahle bagcotjwe ngematje. \v 27 Nase babalandzile babamisa phambi kwalabadzala. Umpristi lomkhulu wabagweba ngemibuto, watsi, \v 28 ''Siniyalisisile kutsi ningafundzisi ngaleligama, kodvwa senigcwalise iJerusalem ngalemfundziso yenu futsi nifisa kuletsa ingati yalendvodza etukwetfu. -======= -\v 26 Ngako ke siphatsimandla selitempeli sahamba kanye netisebenti, bababuyisa emuva, ngaphandle kwekubaphocelela, ngoba bebasaba kutsi bangahle bagcotjwe ngematje. \v 27 Nase babalandzile babamisa phambi kwalabadzala. Umpristi lomkhulu wabagweba ngemibuto, watsi, \v 28 ''Siniyalisisile kutsi ningafundzisi ngaleligama, kodvwa senigcwalise iJerusalem ngalemfundziso yenu futsi nifisa kuletsa ingati yalendvodza etukwetfu. ->>>>>>> 34ca93db297f1e445caee78d664331c0c4da9693 +\v 26 Ngako ke siphatsimandla selitempeli sahamba kanye netisebenti, bababuyisa emuva, ngaphandle kwekubaphocelela, ngoba bebasaba kutsi bangahle bagcotjwe ngematje. \v 27 Nase babalandzile babamisa phambi kwalabadzala. Umpristi lomkhulu wabagweba ngemibuto, watsi, \v 28 ''Siniyalisisile kutsi ningafundzisi ngaleligama, kodvwa senigcwalise iJerusalem ngalemfundziso yenu futsi nifisa kuletsa ingati yalendvodza etukwetfu. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 5a552ef..ab9dc19 100644 --- a/manifest.json +++ b/manifest.json @@ -111,6 +111,7 @@ "05-19", "05-22", "05-24", + "05-26", "05-29", "05-33", "05-35", @@ -184,6 +185,7 @@ "09-40", "10-title", "10-01", + "10-03", "10-07", "10-09", "10-13",