diff --git a/06/07.txt b/06/07.txt index 5cd084c..0d36fe8 100644 --- a/06/07.txt +++ b/06/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Lefatshe le le nwang metsi a pula e e tshologelang mo go lone, ebile le ntsha dijwalo tse di mosola mo go ba ba le berekang ke lone le segofadiwang ke Modimo. \v 8 Mme fa le tlhoga mitlwa, ga le na mosola mme le gaufi le phutso. Bokhutlo jwa lone ke go sa. -======= -\v 7 Lefatshe le le nwang metsi a pula e e tshologelang mo go lone, ebile le ntsha dijwalo tse di mosola mo go ba ba le berekang ke lone le segofadiwang ke Modimo. \v 8 Mme fa le tlhoga mitlwa, ga le na mosola mme le gaufi le phutso. Bokhutlo jwa lone ke go sha. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 7 Lefatshe le le nwang metsi a pula e e tshologelang mo go lone, ebile le ntsha dijwalo tse di mosola mo go ba ba le berekang ke lone le segofadiwang ke Modimo. \v 8 Mme fa le tlhoga mitlwa, ga le na mosola mme le gaufi le phutso. Bokhutlo jwa lone ke go sha. \ No newline at end of file diff --git a/06/11.txt b/06/11.txt index 82c5a58..ee2fd03 100644 --- a/06/11.txt +++ b/06/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Re eletsa thata gore mongwe le mongwe wa lona a supe bonatla go ya ko phelelong ka lebaka la thurihatso e e tletseng ya go itshepa. \v 12 Se ke ka gore lo seka la nna ditshwakga, mme baetsi ba ka tumelo le bopelotelele ba jang boswa jwa ditsholofetso. -======= -\v 11 Re eletsa thata gore mongwe le mongwe wa lona a supe bonatla go ya ko phelelong ka lebaka la thurifatso e e tletseng ya botlhokapoifo. \v 12 Se ke ka gore lo seka la nna ditshwakga, mme le nne baetsi ba bao ka tumelo le bopelotelele ba jang boswa jwa ditsholofetso. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 11 Re eletsa thata gore mongwe le mongwe wa lona a supe bonatla go ya ko phelelong ka lebaka la thurifatso e e tletseng ya botlhokapoifo. \v 12 Se ke ka gore lo seka la nna ditshwakga, mme le nne baetsi ba bao ka tumelo le bopelotelele ba jang boswa jwa ditsholofetso. \ No newline at end of file diff --git a/06/13.txt b/06/13.txt index 01735b1..0a9f782 100644 --- a/06/13.txt +++ b/06/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Gonne fa Modimo a ne a dira tsholofetso ya gagwe ko go Aborehame, o ikannne ka ene ka a ne a ka se ikane ka ope yo mogolo go ene. \v 14 O rile "ke tlile go go segofatsa e le ruri ebile ke tla go godisa mo go golo." \v 15 Ka tsela e e ntseng jalo, Aborehame o ne a amogela se a se solofeditsweng morago ga go leta ka bopelotelele. -======= -\v 13 Gonne fa Modimo a ne a dira tsholofetso ya gagwe ko go Aborehama, o ikannne ka ene ka a ne a ka se ikane ka ope yo mogolo go ene. \v 14 O rile "Ke tsile go go segofatsa e le ruri ebile ke tla go godisa mo go golo." \v 15 Ka tsela e e ntseng jalo, Aborehama o ne a amogela se a se solofeditsweng morago ga go leta ka bopelotelele. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 13 Gonne fa Modimo a ne a dira tsholofetso ya gagwe ko go Aborehama, o ikannne ka ene ka a ne a ka se ikane ka ope yo mogolo go ene. \v 14 O rile "Ke tsile go go segofatsa e le ruri ebile ke tla go godisa mo go golo." \v 15 Ka tsela e e ntseng jalo, Aborehama o ne a amogela se a se solofeditsweng morago ga go leta ka bopelotelele. \ No newline at end of file diff --git a/06/16.txt b/06/16.txt index 98fdfd1..f34ec0e 100644 --- a/06/16.txt +++ b/06/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Gonne batho ba ikana ka mongwe yo mogolo mo go bone. Ko bokhutlong jwa ngangisano nngwe le nngwe, maikano e nna thurifatso. \v 17 Fa Modimo a ne a tsaya tshwetso ya go supegetsa go sa fetogeng ga boleng jwa maikaelelo a gagwe mo bajabosweng ba tsholofetso,o tlhomamisitse ka maikano a gagwe. \v 18 O dirile se ka ntlha ya gore dilo tse pedi tse di sa fetogeng, tse eleng gore ga go kgonagale gore Modimo a ake,rona ba re siileng go ya botshabelong, re tla nna le kgothatso e e masetla go tshegetsa ka thata tshepo e re e beilweng pele. -======= -\v 16 Gonne batho ba ikana ka mongwe yo mogolo mo go bone. Ko bokhutlong jwa kganetsanyo nngwe le nngwe, maikano e nna thurifatso. \v 17 Fa Modimo a ne a tsaya tshwetso ya go supegetsa go sa fetogeng ga boleng jwa maikaelelo a gagwe mo bajabosweng ba tsholofetso,o tlhomamisitse ka maikano a gagwe. \v 18 O dirile se ka ntlha ya gore dilo tse pedi tse di sa fetogeng, tse eleng gore ga go kgonagale gore Modimo a ake,rona ba re siileng go ya botshabelong, re tla nna le kgothatso e e mashetla go tshegetsa ka thata tshepo e re e beilweng pele. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 16 Gonne batho ba ikana ka mongwe yo mogolo mo go bone. Ko bokhutlong jwa kganetsanyo nngwe le nngwe, maikano e nna thurifatso. \v 17 Fa Modimo a ne a tsaya tshwetso ya go supegetsa go sa fetogeng ga boleng jwa maikaelelo a gagwe mo bajabosweng ba tsholofetso,o tlhomamisitse ka maikano a gagwe. \v 18 O dirile se ka ntlha ya gore dilo tse pedi tse di sa fetogeng, tse eleng gore ga go kgonagale gore Modimo a ake,rona ba re siileng go ya botshabelong, re tla nna le kgothatso e e mashetla go tshegetsa ka thata tshepo e re e beilweng pele. \ No newline at end of file diff --git a/06/19.txt b/06/19.txt index fc158af..a6bc995 100644 --- a/06/19.txt +++ b/06/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Re nale tshepo ele tshireletso e e tlhomameng ya mewa ya rona, tshepo e e tsenang mo felong le le boitshepo ka fa morago ga sesiro. \v 20 Jeso o tsene mo felong leo e le morongwa, o nnile moperesita mogolo go ya bosakhutleng mo tsamaisong ya ga Melchizedek. -======= -\v 19 Re nale tshepo ele tshireletso e e tlhomameng ya mewa ya rona, tshepo e e tsenang mo felong le le boitshepo ka fa morago ga sesiro. \v 20 Jeso o tsene mo felong leo e le morongwa, o nnile moperesiti mogolo go ya bosakhutleng mo tsamaisong ya ga Melekiseteke. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 19 Re nale tshepo ele tshireletso e e tlhomameng ya mewa ya rona, tshepo e e tsenang mo felong le le boitshepo ka fa morago ga sesiro. \v 20 Jeso o tsene mo felong leo e le morongwa, o nnile moperesiti mogolo go ya bosakhutleng mo tsamaisong ya ga Melekiseteke. \ No newline at end of file diff --git a/manifest.json b/manifest.json index b728f83..d2c0ee9 100644 --- a/manifest.json +++ b/manifest.json @@ -96,7 +96,12 @@ "06-title", "06-01", "06-04", + "06-07", "06-09", + "06-11", + "06-13", + "06-16", + "06-19", "07-title", "08-title", "08-13",