diff --git a/10/38.txt b/10/38.txt index 9ed1c2a..e77c23c 100644 --- a/10/38.txt +++ b/10/38.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 38 Basiami ba me ba tlaa tshela ka tumelo, fa a leba ko morago, Ke tla a seke ke mo itumedise.'' \v 39 Mme gare ba o baba ko morago ba boela tshenyegong. Le fa gontse jalo, re bangwe baba nang le tumelo go boloka mewa ya rona. -======= -\v 38 Mosiami wame o tla a tshela ka tumelo.Fa a leba kwa morago, ke tla a seke ke mo itumelele.'' \v 39 Mme ga re bao ba ba boelang tshenyegong. Boemong jwa moo, re bangwe ba ba nang le tumelo go boloka mewa ya rona. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 38 Mosiami wame o tla a tshela ka tumelo.Fa a leba kwa morago, ke tla a seke ke mo itumelele.'' \v 39 Mme ga re bao ba ba boelang tshenyegong. Boemong jwa moo, re bangwe ba ba nang le tumelo go boloka mewa ya rona. \ No newline at end of file diff --git a/11/01.txt b/11/01.txt index 67f63c5..dcc1932 100644 --- a/11/01.txt +++ b/11/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 11 \v 1 Jaanong tumelo ke tlhomamiso ka dilo tse di fitlhegileng tsa tsholofetso.Ke bosupi ka ga ditiragalo tse di sa bonweng. \v 2 Ka ga se,borraaronamogolo ba rurifaditswe ke tumelo ya bone. \v 3 Ka tumelo re tlhaloganya gore lebopo le tlhodilwe ka taolo ya Modimo gore se se bonalang se seka sa dirwa ka dilo tse di bonalang. -======= -\c 11 \v 1 Jaanong tumelo ke tlhomamiso ka dilo tse di solofetsweng ka bosenapelaelo. Ke bosupi ka ga ditiragalo tse di iseng di bonwe. \v 2 Gonne ka ntlha ya se, borraaronamogolo ba amogelesegile ka lebaka la tumelo ya bone. \v 3 Ka tumelo re tlhaloganya gore lebopo le tlhodilwe ka taolo ya Modimo gore se se bonalang se be se sa dirwa ka dilo tse di neng di bonala. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\c 11 \v 1 Jaanong tumelo ke tlhomamiso ka dilo tse di solofetsweng ka bosenapelaelo. Ke bosupi ka ga ditiragalo tse di iseng di bonwe. \v 2 Gonne ka ntlha ya se, borraaronamogolo ba amogelesegile ka lebaka la tumelo ya bone. \v 3 Ka tumelo re tlhaloganya gore lebopo le tlhodilwe ka taolo ya Modimo gore se se bonalang se be se sa dirwa ka dilo tse di neng di bonala. \ No newline at end of file diff --git a/11/04.txt b/11/04.txt index da07a83..60f7144 100644 --- a/11/04.txt +++ b/11/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 E ne e le ka tumela gore Abele a ntshetse modimo setlhabelo se se botoka mo go sa ga Kaene,ka se, o ne a tlhomamisiwa a le tshiamo gape Modimo a bua sentle ka ga setlhabelo sa gagwe,mme ka tumelo Abele o ntse o a bua le fa a sule. -======= -\v 4 E ne e le ka tumelo gore Abele a ntshetse Modimo setlhabelo se se botoka mo go sa ga Kaene, ka se, o ne a kaiwa a le tshiamo, mme Modimo a bua sentle ka ga gagwe ka ntlha ya setlhabelo sa gagwe, mme ka tumelo Abele o santse a bua le fa a sule. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 4 E ne e le ka tumelo gore Abele a ntshetse Modimo setlhabelo se se botoka mo go sa ga Kaene, ka se, o ne a kaiwa a le tshiamo, mme Modimo a bua sentle ka ga gagwe ka ntlha ya setlhabelo sa gagwe, mme ka tumelo Abele o santse a bua le fa a sule. \ No newline at end of file diff --git a/11/05.txt b/11/05.txt index 67cc269..150d680 100644 --- a/11/05.txt +++ b/11/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 E ne e le ka tumelo gore Enoko a tseelwe ko godimo gore a seka a bona loso la gagwe.'' O ne a seka a bonwa ka gore Modimo o ne a mo tsere.''Gonne pele ga a tsewa go ne go rurifaditswe gore o itumedisitse Modimo. \v 6 Jaanong ko ntle ga tumelo ga go kgonafale go mo itumedisa,gonne go tlhokafala gore mongwe le mongwe oo tlang mo Modimong o tshwanetse gore a dumele gore o teng gape gore ke Ene o o tla a duelang ba ba mmatlang. -======= -\v 5 E ne e le ka tumelo gore Enoke a tseelwe kwa godimo gore a seka a bona loso la gagwe.'' O ne a seka a bonwa ka gore Modimo o ne a mo tsere.''Gonne pele ga a tsewa go ne go rurifaditswe gore o itumedisitse Modimo. \v 6 Jaanong ko ntle ga tumelo ga go kgonafale go mo itumedisa, gonne go tlhokafala gore mongwe le mongwe yo o tlang mo Modimong o tshwanetse gore a dumele gore o teng gape gore ke moduedi wa ba ba mmatlang. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 5 E ne e le ka tumelo gore Enoke a tseelwe kwa godimo gore a seka a bona loso la gagwe.'' O ne a seka a bonwa ka gore Modimo o ne a mo tsere.''Gonne pele ga a tsewa go ne go rurifaditswe gore o itumedisitse Modimo. \v 6 Jaanong ko ntle ga tumelo ga go kgonafale go mo itumedisa, gonne go tlhokafala gore mongwe le mongwe yo o tlang mo Modimong o tshwanetse gore a dumele gore o teng gape gore ke moduedi wa ba ba mmatlang. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 53838be..ad3d8fb 100644 --- a/manifest.json +++ b/manifest.json @@ -149,7 +149,11 @@ "10-30", "10-32", "10-35", + "10-38", "11-title", + "11-01", + "11-04", + "11-05", "12-title", "13-title", "13-05",