diff --git a/13/15.txt b/13/15.txt index f4abde6..ad7770d 100644 --- a/13/15.txt +++ b/13/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Ka ene, jalo he, a re ntshetseng Modimo ditlhabelo tsa kgalaletso ka nako tsotlhe, kgalaletso e e leng leungo la dipounama le le godisang leina la gagwe. \v 16 A re seka ra lebala go dira bomolemo le go thusanya, gonne Modimo o itumedisiwa thata ke ditlhabelo tsa mofuta o. \v 17 Utlwang le bo le ikobele baeteledipele ba lona, gonne ba disa mewa ya lona, fela jaaka ba ba tsileng go fa tlhaloso. Nnang kutlo gore baeteledipele ba lona ba tle ba dire se ka boitumelo, eseng ka go ngongorega, selo se se sa kakeng sa le sologela mosola. -======= -\v 15 Ka ene, jalo he, a re ntshetseng Modimo ditlhabelo tsa kgalaletso ka nako tsotlhe, kgalaletso e e leng leungo la dipounama le le godisang leina la gagwe. \v 16 A re seka ra lebala go dira bomolemo le go thusanya, gonne Modimo o itumedisiwa thata ke ditlhabelo tsa mofuta o. \v 17 Utlwang le bo le ikobele baeteledipele ba lona, gonne ba disa mewa ya lona, fela jaaka ba ba tsileng go fa tlhaloso. Nnang kutlo gore baeteledipele ba lona ba tle ba dire se ka boitumelo, eseng ka go ngongorega, selo se se sa kakeng sa le sologela molemo. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 15 Ka ene, jalo he, a re ntshetseng Modimo ditlhabelo tsa kgalaletso ka nako tsotlhe, kgalaletso e e leng leungo la dipounama le le godisang leina la gagwe. \v 16 A re seka ra lebala go dira bomolemo le go thusanya, gonne Modimo o itumedisiwa thata ke ditlhabelo tsa mofuta o. \v 17 Utlwang le bo le ikobele baeteledipele ba lona, gonne ba disa mewa ya lona, fela jaaka ba ba tsileng go fa tlhaloso. Nnang kutlo gore baeteledipele ba lona ba tle ba dire se ka boitumelo, eseng ka go ngongorega, selo se se sa kakeng sa le sologela molemo. \ No newline at end of file diff --git a/13/20.txt b/13/20.txt index 1bbcd8c..daf3968 100644 --- a/13/20.txt +++ b/13/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Jaanong a Modimo wa kagiso, yo o busitseng modisa mogolo wa dinku go tswa kwa go ba ba suleng , Morena wa rona Jeso, ka madi a kgolagano e e sa feleng, \v 21 a le siamise ka sengwe le sengwe se se molemo go dira thato ya gagwe. A a dire mo go rona se se mo itumedisang go le go golo, ka Jeso Keresete, a kgalalelo e isiwe go ene ka bosakhutleng. Amene. -======= -\v 20 Jaanong a Modimo wa kagiso, yo o busitseng modisa mogolo wa dinku go tswa kwa go ba ba suleng , Morena wa rona Jeso, ka madi a kgolagano e e sa feleng, \v 21 a le siamise ka sengwe le sengwe se se molemo go dira thato ya gagwe. A a dire mo go rona se se mo itumedisang go le go golo, ka Jeso Keresete, a kgalalelo e isiwe go ene ka bosakhutleng. Amen. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 20 Jaanong a Modimo wa kagiso, yo o busitseng modisa mogolo wa dinku go tswa kwa go ba ba suleng , Morena wa rona Jeso, ka madi a kgolagano e e sa feleng, \v 21 a le siamise ka sengwe le sengwe se se molemo go dira thato ya gagwe. A a dire mo go rona se se mo itumedisang go le go golo, ka Jeso Keresete, a kgalalelo e isiwe go ene ka bosakhutleng. Amen. \ No newline at end of file diff --git a/13/22.txt b/13/22.txt index 8d8557d..f5ecc7d 100644 --- a/13/22.txt +++ b/13/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Jaanong ke a le kgothatsa, bakaulengwe go tshola lefoko la kgothatso le ke le le kwaletseng ka bokhutshwane. \v 23 Itseng gore mokaulengwe wa rona Timothi, o golotswe, yo ke tla le bonang ka ene fa a ka tla ka bonako. -======= -\v 22 Jaanong ke a le kgothatsa, bakaulengwe go tshola lefoko la kgothatso le ke le le kwaletseng ka bokhutshwane. \v 23 Itseng gore mokaulengwe wa rona Timotheo, o golotswe, yo ke tla le bonang le ene fa a ka tla ka bonako. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 22 Jaanong ke a le kgothatsa, bakaulengwe go tshola lefoko la kgothatso le ke le le kwaletseng ka bokhutshwane. \v 23 Itseng gore mokaulengwe wa rona Timotheo, o golotswe, yo ke tla le bonang le ene fa a ka tla ka bonako. \ No newline at end of file diff --git a/13/24.txt b/13/24.txt index 25c8bb3..7dde48e 100644 --- a/13/24.txt +++ b/13/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Dumedisang baeteledipele botlhe ba lona le badumedi botlhe. Ba ba ko Italia ba le dumedisa. \v 25 A tshegofatso e nne le lona lotlhe. -======= -\v 24 Dumedisang baeteledipele botlhe ba lona le badumedi botlhe. Ba ba ko Itali ba a le dumedisa. \v 25 A tshegofatso e nne le lona lotlhe. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 24 Dumedisang baeteledipele botlhe ba lona le badumedi botlhe. Ba ba ko Itali ba a le dumedisa. \v 25 A tshegofatso e nne le lona lotlhe. \ No newline at end of file diff --git a/manifest.json b/manifest.json index b1b59a6..7365d80 100644 --- a/manifest.json +++ b/manifest.json @@ -185,6 +185,10 @@ "13-07", "13-09", "13-12", - "13-18" + "13-15", + "13-18", + "13-20", + "13-22", + "13-24" ] } \ No newline at end of file