From 357a2f8999b785e7524380ead1a35764b5758ef4 Mon Sep 17 00:00:00 2001 From: jdwood Date: Fri, 4 Aug 2017 13:03:28 -0400 Subject: [PATCH] Fri Aug 04 2017 13:03:28 GMT-0400 (EDT) --- 11/07.txt | 6 +----- 11/08.txt | 6 +----- 11/11.txt | 6 +----- manifest.json | 3 +++ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/11/07.txt b/11/07.txt index 1357221..b9c2833 100644 --- a/11/07.txt +++ b/11/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 E ne e le ka tumelo gore Noa a neelwe molaetsa wa Modimo ka ga dilo tse di ise di bonale,ka go lemoga Modimo a aga areka go boloka ba ntlo ya gagwe,ka go dira jalo a gana lefatshe mme a nna moja boswa wa tshiamo ka ntlha ya tumelo. -======= -\v 7 E ne e le ka tumelo gore Noa a neelwe molaetsa wa Modimo ka ga dilo tse di iseng di bonale, ka boifa Modimo a aga areka go boloka ba ntlo ya gagwe. Ka go dira jalo, a sekisa lefatshe mme a nna moja boswa wa tshiamo ka ntlha ya tumelo. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 7 E ne e le ka tumelo gore Noa a neelwe molaetsa wa Modimo ka ga dilo tse di iseng di bonale, ka boifa Modimo a aga areka go boloka ba ntlo ya gagwe. Ka go dira jalo, a sekisa lefatshe mme a nna moja boswa wa tshiamo ka ntlha ya tumelo. \ No newline at end of file diff --git a/11/08.txt b/11/08.txt index a5b96fa..d7f0a3c 100644 --- a/11/08.txt +++ b/11/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 E ne e le ka tumelo gore Aberehama, fa ane a bidiwa ,a obamela mme a tswa mo lefelong le a neng a tshwanetse go le amogela go le rua boswa,a tswela ko ntle a sa itse gore o ya kae. \v 9 E ne e le ka tumelo gore a tshele jaaka motshabi mo le fatsheng la tsholofetso,o ne a nna mo motlaaganeng le Isake le Jakoba,bajaboswa mmogo ba tsholofetso. \v 10 Gonne o ne a lebeletse toropo ee nang le metheo, toropo e motshwantshi le moagi wa yone e tla a nna Modimo. -======= -\v 8 E ne e le ka tumelo gore Aborahama, fa a ne a bidiwa , a utlwa mme a ya kwa lefatsheng le a neng a tshwanetse go le amogela e le boswa. A tswa, a sa itse gore o ya kae. \v 9 E ne e le ka tumelo gore a bo a tshedile jaaka motswakwa mo le fatsheng la tsholofetso. O ne a nna mo tanteng le Isake le Jakoba, bajaboswa mmogo ba tsholofetso. \v 10 Gonne o ne a lebeletse pele motse o o nang le metheo, motse o motshwantshi le moagi wa one e tla a nnang Modimo. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 8 E ne e le ka tumelo gore Aborahama, fa a ne a bidiwa , a utlwa mme a ya kwa lefatsheng le a neng a tshwanetse go le amogela e le boswa. A tswa, a sa itse gore o ya kae. \v 9 E ne e le ka tumelo gore a bo a tshedile jaaka motswakwa mo le fatsheng la tsholofetso. O ne a nna mo tanteng le Isake le Jakoba, bajaboswa mmogo ba tsholofetso. \v 10 Gonne o ne a lebeletse pele motse o o nang le metheo, motse o motshwantshi le moagi wa one e tla a nnang Modimo. \ No newline at end of file diff --git a/11/11.txt b/11/11.txt index cdaaae1..0f84066 100644 --- a/11/11.txt +++ b/11/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 E ne e le ka tumelo, le fa Sara ka bo ene a ne a le moopa,gore Aberehame a nne le thata go tlhokomela ngwana.Se se diragetse le fa a ntse a godile,gonne o ne a lemogilwe a ikanyega yo o neetsweng tsholofetso. \v 12 Jalo he,go tswa mo monneng a le mongwe oo neng a sule go tshotswe ba ba tshwanang le dinaledi mo legodimong ba bontsi jwa bone bo tshwanang le di tlhaka tsa motlhaba go bapa le lewatle oo sa balegeng. -======= -\v 11 E ne e le ka tumelo, le fa Sara a ne a le moopa,gore Aberehame a nne le bokgoni jwa go nna le ngwana.Se se diragetse le fa a ne a godile thata,gonne o ne a kaile yo o neetseng tsholofetso a ikanyega. \v 12 Jalo he,go tswa mo monneng a le mongwe yo o neng a lebega a sule, go tshotswe ba ba tshwanang le dinaledi mo legodimong ba bontsi jwa bone bo tshwanang le ditlhaka tsa motlhaba go bapa le lewatle, o o sa balegeng. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 11 E ne e le ka tumelo, le fa Sara a ne a le moopa, gore Aberehame a nne le bokgoni jwa go nna le ngwana. Se se diragetse le fa a ne a godile thata, gonne o ne a kaile yo o neetseng tsholofetso a ikanyega. \v 12 Jalo he,go tswa mo monneng a le mongwe yo o neng a lebega a sule, go tshotswe ba ba tshwanang le dinaledi mo legodimong ba bontsi jwa bone bo tshwanang le ditlhaka tsa motlhaba go bapa le lewatle, o o sa balegeng. \ No newline at end of file diff --git a/manifest.json b/manifest.json index ad3d8fb..af052bc 100644 --- a/manifest.json +++ b/manifest.json @@ -154,6 +154,9 @@ "11-01", "11-04", "11-05", + "11-07", + "11-08", + "11-11", "12-title", "13-title", "13-05",