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

This commit is contained in:
jdwood 2017-08-04 12:11:28 -04:00
parent a918385bb4
commit ea565fce99
4 changed files with 6 additions and 15 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 2 \v 1 Ka jalo re tshwanetse ra ela tlhoko thata tse re di utlwileng, gore re seka ra tswa mo go tsone.
=======
\v 1 Ka jalo re tshwanetse ra ela tlhoko thata tse re di utlwileng, gore re seka ra tswa mo go tsone.
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\c 2 \v 1 Ka jalo re tshwanetse ra ela tlhoko thata tse re di utlwileng, gore re seka ra tswa mo go tsone.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 2 Fa ele gore molaetsa yo o neng o builwe ka baengele o boammaaruri, tlolo molao le tlhoko kutlo nngwe le nngwe e tlaa amogela kotlhao, \v 3 re ka falola jang fa re ikgatolosa poloko e kgolo e? Poloko ee builweng ke Morena e be ya tlhomamisiwa mo go rona ke ba ba e utlwileng. \v 4 Modimo o supa ka ditshupo le dikgakgamatso, le ditiro tse di maatla, le ka go aba dimpho tsa Semoya ka fa a ratang ka teng.
=======
\v 2 Fa ele gore molaetsa o o neng o builwe ka baengele o boammaaruri, tlolo molao le tlhoko kutlo nngwe le nngwe e tla a amogela kotlhao, \v 3 re ka falola jang fa re ikgatholosa poloko e kgolo e? Poloko e ke e e builweng ke Morena e be ya tlhomamisiwa mo go rona ke ba ba e utlwileng. \v 4 Modimo o supile ka ditshupo le dikgakgamatso, le ditiro tse di maatla, le ka go aba dineo tsa Moya ka fa a ratang ka teng.
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\v 2 Fa ele gore molaetsa o o neng o builwe ka baengele o boammaaruri, tlolo molao le tlhoko kutlo nngwe le nngwe e tla a amogela kotlhao, \v 3 re ka falola jang fa re ikgatholosa poloko e kgolo e? Poloko e ke e e builweng ke Morena e be ya tlhomamisiwa mo go rona ke ba ba e utlwileng. \v 4 Modimo o supile ka ditshupo le dikgakgamatso, le ditiro tse di maatla, le ka go aba dineo tsa Moya ka fa a ratang ka teng.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 5 Ka gore gase ga baengele gore Modimo a ba atlholele lefatshe le le tlang, ka tse re di buang. \v 6 Le fa go ntse jalo, mongwe golo gongwe o buile, are, ''Ke motho ofe yo o akanyang ka ene? Kana morwa motho, yo le kgathalang ka ene?
=======
\v 5 Ga se baengele ba Modimo a ba neetseng taolo ya lefatshe le le tlang, ka tse re di buang. \v 6 Le fa go ntse jalo, mongwe golo gongwe o buile, are, '' Motho ya bo e le mang, yo o akanyang ka ene? Kana morwa motho, yo o kgathalang ka ene?
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\v 5 Ga se baengele ba Modimo a ba neetseng taolo ya lefatshe le le tlang, ka tse re di buang. \v 6 Le fa go ntse jalo, mongwe golo gongwe o buile, are, '' Motho ya bo e le mang, yo o akanyang ka ene? Kana morwa motho, yo o kgathalang ka ene?

View File

@ -63,6 +63,9 @@
"01-10",
"01-13",
"02-title",
"02-01",
"02-02",
"02-05",
"04-title",
"05-title",
"06-title",