diff --git a/05/06.txt b/05/06.txt index 1296173..72d1e3d 100644 --- a/05/06.txt +++ b/05/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Go tshwana fela le jaaka a bua gape gore, "O moperesita go ya bosakhutleng mo tsamaisong ya ga Melchizedek." -======= -\v 6 Go tshwana fela le jaaka a bua gape a re, "O moperesiti go ya bosakhutleng mo tsamaisong ya ga Melekisedeke." ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 6 Go tshwana fela le jaaka a bua gape a re, "O moperesiti go ya bosakhutleng mo tsamaisong ya ga Melekisedeke." \ No newline at end of file diff --git a/05/07.txt b/05/07.txt index 4c01eda..1b27af6 100644 --- a/05/07.txt +++ b/05/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Ka matsatsi a fa a le mo senameng, Keresete o ne a isa dithapelo le dikopo ka selelo se se ko godimo ko Modimong, Ene o kgonang go mmoloka mo losong. O ne a reediwa ka ntlha ya tebego ya tshiamo ya gagwe. \v 8 Le fa e ne e le morwa, O ne a ithuta kutlo mo dilong tse a di bogileng. -======= -\v 7 Ka matsatsi a fa a le mo senameng, Keresete o ne a isa dithapelo le dikopo ka selelo se se ko godimo kwa Modimong, Ene yo o kgonang go mmoloka mo losong. O ne a reediwa ka ntlha ya tshiamo ya gagwe. \v 8 Le fa e ne e le Morwa, o ne a ithuta kutlo mo dilong tse a di bogileng. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 7 Ka matsatsi a fa a le mo senameng, Keresete o ne a isa dithapelo le dikopo ka selelo se se ko godimo kwa Modimong, Ene yo o kgonang go mmoloka mo losong. O ne a reediwa ka ntlha ya tshiamo ya gagwe. \v 8 Le fa e ne e le Morwa, o ne a ithuta kutlo mo dilong tse a di bogileng. \ No newline at end of file diff --git a/05/09.txt b/05/09.txt index 524d0df..08121e5 100644 --- a/05/09.txt +++ b/05/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 O ne a siamisiwa mme a nna poloko ya bosakhutleng mo mongwe le mongwe yo o mo obamelang. \v 10 O ne a tlhomiwa ke Modimo jaaka moperesita mogolo mo tsamaisong ya ga Melchizedek. \v 11 Go gontsi mo re ka go buang ka Jeso, mme go thata go tlhalosa ka le itlhokomolositse. -======= -\v 9 O ne a siamisiwa mme a nna poloko ya bosakhutleng mo go mongwe le mongwe yo o mo utlwang. \v 10 O ne a tewa ke Modimo go nna moperesiti mogolo mo tsamaisong ya ga Melekiseteke. \v 11 Go gontsi mo re ka go buang ka Jeso, mme go thata go tlhalosa ka le sa batle go utlwa. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 9 O ne a siamisiwa mme a nna poloko ya bosakhutleng mo go mongwe le mongwe yo o mo utlwang. \v 10 O ne a tewa ke Modimo go nna moperesiti mogolo mo tsamaisong ya ga Melekiseteke. \v 11 Go gontsi mo re ka go buang ka Jeso, mme go thata go tlhalosa ka le sa batle go utlwa. \ No newline at end of file diff --git a/05/12.txt b/05/12.txt index d55d854..3369fbe 100644 --- a/05/12.txt +++ b/05/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Ka nako e le ka bo le le baruti, le santse le na le letlhoko la mongwe yo o ka le rutang molao wa molaetsa ya Modimo. Le tlhoka masi eseng dijo tse di thata. \v 13 Ka go nne mongwe le mongwe yo o nwang masi ga a na botsipa jwa molaetsa wa tshiamo, ka gore e santse e le ngwana. \v 14 Mme dijo tse di thata ke tsa bagolo. Ba ke ba ka ntlha ya kgolo ya bone ba katisitseng go tlhaloganya pharologanyo ya bomolemo le bosula. -======= -\v 12 Le fa ka nako e le ka bo le le barutintshi, le santse le letlhoka mongwe yo o ka le rutang dithuto tsa ntlha tsa molaetsa wa Modimo. Le tlhoka masi e seng dijo tse di thata. \v 13 Ka go nne mongwe le mongwe yo o nwang masi ga a na boitemogelo jwa molaetsa wa tshiamo, ka gore o santse a le ngwana. \v 14 Mme dijo tse di thata ke tsa bagolo. Ba ke ba ka ntlha ya kgolo ya bone ba katisitseng go tlhaloganya pharologanyo ya bomolemo le bosula. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 12 Le fa ka nako e le ka bo le le barutintshi, le santse le letlhoka mongwe yo o ka le rutang dithuto tsa ntlha tsa molaetsa wa Modimo. Le tlhoka masi e seng dijo tse di thata. \v 13 Ka go nne mongwe le mongwe yo o nwang masi ga a na boitemogelo jwa molaetsa wa tshiamo, ka gore o santse a le ngwana. \v 14 Mme dijo tse di thata ke tsa bagolo. Ba ke ba ka ntlha ya kgolo ya bone ba katisitseng go tlhaloganya pharologanyo ya bomolemo le bosula. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4dce657..43ff737 100644 --- a/manifest.json +++ b/manifest.json @@ -89,6 +89,10 @@ "05-title", "05-01", "05-04", + "05-06", + "05-07", + "05-09", + "05-12", "06-title", "06-09", "07-title",