From dfbe3bf2182443a75f24c01698d6cda0e718c7ff Mon Sep 17 00:00:00 2001 From: jdwood Date: Fri, 4 Aug 2017 12:53:28 -0400 Subject: [PATCH] Fri Aug 04 2017 12:53:28 GMT-0400 (EDT) --- 09/23.txt | 6 +----- 09/25.txt | 6 +----- 09/27.txt | 6 +----- manifest.json | 3 +++ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/09/23.txt b/09/23.txt index 06ba5ba..f040661 100644 --- a/09/23.txt +++ b/09/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Jalo he, go ne go tlhokafala gore meriti ya dilo tse di kwa legodimong di tshwanetse go ntlafadiwa ka madi a ditlhabelo tsa diphologolo. Lefa gontse jalo dilo tsa legodimo tsone di ne di tshwanelwa ke go tlhapisiwa ka ditlhabelo tse di botoka . \v 24 Keresete ga a tsena mo lefelong le le boitshepo go gaisa le le dirilweng ka diatla, se e leng moriti fela wa dilo tsa nnete. Mo boemong jwa seo,a tsene mo legodimong la nnete, gore jaanong a re emele fa pele ga Modimo. -======= -\v 23 Jalo he, go ne go tlhokafala gore meriti ya dilo tse di kwa legodimong di tshwanetse go ntlafadiwa ka madi a ditlhabelo tsa diphologolo. Lefa gontse jalo, dilo tsa legodimo tsone di ne di tshwanelwa ke go tlhapisiwa ka ditlhabelo tse di botoka . \v 24 Keresete ga a tsena mo lefelong le le boitshepo ja boitshepo le le dirilweng ka diatla, se e leng moriti fela wa dilo tsa nnete. Mo boemong jwa seo,a tsene mo legodimong la nnete, gore jaanong a re emele fa pele ga Modimo. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 23 Jalo he, go ne go tlhokafala gore meriti ya dilo tse di kwa legodimong di tshwanetse go ntlafadiwa ka madi a ditlhabelo tsa diphologolo. Lefa gontse jalo, dilo tsa legodimo tsone di ne di tshwanelwa ke go tlhapisiwa ka ditlhabelo tse di botoka . \v 24 Keresete ga a tsena mo lefelong le le boitshepo ja boitshepo le le dirilweng ka diatla, se e leng moriti fela wa dilo tsa nnete. Mo boemong jwa seo,a tsene mo legodimong la nnete, gore jaanong a re emele fa pele ga Modimo. \ No newline at end of file diff --git a/09/25.txt b/09/25.txt index 2daf531..36390d3 100644 --- a/09/25.txt +++ b/09/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Ga aa ya koo gore a iketshe gantsi, jaaka moperesiti yo mogolo yo o neng a tsena mo lefelong la boitshepo ngwaga le ngwaga ka madi a yo mongwe . \v 26 Fa go ne go ntse jalo o ne a ka tshwanelwa ke go boga gantsi go tswa kwa motheong wa lefatshe. Mme jaanong ke gangwefela kwa bofelong jwa metlha, e e kailweng gore a nyeletse sebe ka go intsha setlhabelo. -======= -\v 25 Ga a a ya koo gore a intshe setlhabelo gantsi, jaaka moperesiti yo mogolo yo o neng a tsena mo lefelong la boitshepo ja boitshepo ngwaga le ngwaga ka madi a yo mongwe . \v 26 Fa go ne go ntse jalo, o ne a ka tshwanelwa ke go boga gantsi go tswa kwa motheong wa lefatshe. Mme jaanong ke gangwe fela kwa bofelong jwa metlha, e e kailweng gore a nyeletse sebe ka go intsha setlhabelo. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 25 Ga a a ya koo gore a intshe setlhabelo gantsi, jaaka moperesiti yo mogolo yo o neng a tsena mo lefelong la boitshepo ja boitshepo ngwaga le ngwaga ka madi a yo mongwe . \v 26 Fa go ne go ntse jalo, o ne a ka tshwanelwa ke go boga gantsi go tswa kwa motheong wa lefatshe. Mme jaanong ke gangwe fela kwa bofelong jwa metlha, e e kailweng gore a nyeletse sebe ka go intsha setlhabelo. \ No newline at end of file diff --git a/09/27.txt b/09/27.txt index 0982abd..df6cfaa 100644 --- a/09/27.txt +++ b/09/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 Mongwe le mogwe o laoletswe go swa gangwefela mme morago go tla katlholo. \v 28 Ka mokgwa o o tshwanang, Keresete le ene, yo o neng a ntshiwa ga ngwefela go phimola maleo a ba le bantsi, o tla a bonala lwa bobedi a sa tlela sebe , mme o tlela kgololo ya ba o ba ba moletileng ka bopelotelele. -======= -\v 27 Mongwe le mogwe o laoletswe go swa gangwe fela mme morago go tla katlholo. \v 28 Ka mokgwa o o tshwanang, Keresete le ene, yo o neng a ntshiwa gangwe fela go phimola maleo a ba le bantsi, o tla a bonala la bobedi a sa tlele sebe , mme a tlela kgololo ya bao ba ba mo letileng ka bopelotelele. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 27 Mongwe le mogwe o laoletswe go swa gangwe fela mme morago go tla katlholo. \v 28 Ka mokgwa o o tshwanang, Keresete le ene, yo o neng a ntshiwa gangwe fela go phimola maleo a ba le bantsi, o tla a bonala la bobedi a sa tlele sebe , mme a tlela kgololo ya bao ba ba mo letileng ka bopelotelele. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 15324e8..f74af6d 100644 --- a/manifest.json +++ b/manifest.json @@ -132,6 +132,9 @@ "09-16", "09-18", "09-21", + "09-23", + "09-25", + "09-27", "10-title", "11-title", "12-title",