Fri Aug 04 2017 12:07:28 GMT-0400 (EDT)

This commit is contained in:
jdwood 2017-08-04 12:07:28 -04:00
parent 558d378b19
commit aa7f30b10c
4 changed files with 8 additions and 16 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 1 \v 1 Bogologolo Modimo o ne a bua le badimo ba rona ka baporofiti ka dinako le ditsela tse dintsi. \v 2 Mme mo malatsing a bofelo, Modimo o bua le rona ka morwa, yo a mo tlhomileng mojaboswa wa dilo tsotlhe. Ke ka ene gore Modimo gape a bo a dirile lobopo. \v 3 Ke ene lesedi la kgalalelo ya Modimo, setho sa modimo ka sebele. O tshwaraganya dilo tsotlhe ka maatla a lefoko la gagwe. Morago ga go tlhatswa dibe a nna mo letsogong le legolo la yo mogolo.
=======
\c 1 \v 1 Bogologolo Modimo o ne a bua le borrarona mogolo ka baporofiti ka dinako tse dintsi le ditsela tse dintsi. \v 2 Mme mo malatsing ano a bofelo, Modimo o buile le rona ka Morwa, yo a mo tlhomileng mojaboswa wa dilo tsotlhe. Ke ka ene gore Modimo gape a bo a dirile lobopo. \v 3 Ke ene lesedi la kgalalelo ya Modimo, setho sa modimo ka sebele. O tshwaraganya dilo tsotlhe ka maatla a lefoko la gagwe. Morago ga go tlhatswa dibe a nna mo letsogong le legolo la yo Mogolo kwa godimo.
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\c 1 \v 1 Bogologolo Modimo o ne a bua le borrarona mogolo ka baporofiti ka dinako tse dintsi le ditsela tse dintsi. \v 2 Mme mo malatsing ano a bofelo, Modimo o buile le rona ka Morwa, yo a mo tlhomileng mojaboswa wa dilo tsotlhe. Ke ka ene gore Modimo gape a bo a dirile lobopo. \v 3 Ke ene lesedi la kgalalelo ya Modimo, setho sa modimo ka sebele. O tshwaraganya dilo tsotlhe ka maatla a lefoko la gagwe. Morago ga go tlhatswa dibe a nna mo letsogong le legolo la yo Mogolo kwa godimo.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 4 O nnile godimo go baengele, gonne leina le a le ruileng le legolo go na le la baengele. \v 5 Ke mo go ofe wa baengele yo Modimo a mo reileng a re o morwaake, gompieno ke tla nna rrago , Mme gape, ke tla nna rragwe, e tla nna morwaake?
=======
\v 4 O nnile godimo go baengele, gonne leina le a le ruileng le legolo go na le la bone. \v 5 Ke mo go ofe wa baengele yo Modimo a mo reileng a re, "O morwaake, gompieno ke tla nna rrago" , Mme gape, "Ke tla nna rragwe, e tla nna morwaake"?
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\v 4 O nnile godimo go baengele, gonne leina le a le ruileng le legolo go na le la bone. \v 5 Ke mo go ofe wa baengele yo Modimo a mo reileng a re, "O morwaake, gompieno ke tla nna rrago" , Mme gape, "Ke tla nna rragwe, e tla nna morwaake"?

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 6 Mme gape Modimo faa tlisa leitibilo mo lefatsheng, a re botlhe baengele ba Modimo ba tla mo obamela. \v 7 Ka ga baengele a re, ke ene yoo dirang baegele ba gagwe mewa le batlhanka ba gagwe kgabo ya molelo.
=======
\v 6 Mme gape Modimo fa a tsisa maitibilo mo lefatsheng, a re, "Botlhe baengele ba Modimo ba tshwanetse go mo obamela." \v 7 Ka ga baengele a re, "Ke ene yo o dirang baengele ba gagwe mewa, le batlhanka ba gagwe kgabo ya molelo."
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\v 6 Mme gape Modimo fa a tsisa maitibilo mo lefatsheng, a re, "Botlhe baengele ba Modimo ba tshwanetse go mo obamela." \v 7 Ka ga baengele a re, "Ke ene yo o dirang baengele ba gagwe mewa, le batlhanka ba gagwe kgabo ya molelo."

View File

@ -50,11 +50,15 @@
"Lemphitlhetse Reetsakgosi",
"Pontsho",
"David Ntsima",
"Goitsemang"
"Goitsemang",
"John Wood"
],
"finished_chunks": [
"front-title",
"01-title",
"01-01",
"01-04",
"01-06",
"02-title",
"04-title",
"05-title",