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

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

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 7 Ka jalo, go ntse jaaka ka fa Moya o o boitshepo o buang ka teng o re," Gompieno, fa o utlwa lentswe la gagwe \v 8 lo seka lwa thatafatsa dipelo tsa lona jaaka diingaodi, mo nakong ya teko mo Sekakeng.
=======
\v 7 Ka jalo, go ntse fela jaaka Moya o o boitshepo o buang ka teng o re," Gompieno, fa le utlwa lentswe la gagwe \v 8 le seka la thatafatsa dipelo tsa lona mo boingaoding,jaaka nako ya teko mo Sekakeng.
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\v 7 Ka jalo, go ntse fela jaaka Moya o o boitshepo o buang ka teng o re," Gompieno, fa le utlwa lentswe la gagwe \v 8 le seka la thatafatsa dipelo tsa lona mo boingaoding,jaaka nako ya teko mo Sekakeng.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 9 Se e ne e le fa badimo ba gago ba ingaola ka go nteka, le fa ba ntse ba bone ditiro tsame dingwaga di le masome mane. \v 10 Ka jalo, ke ne ka seka ka itumelela kokomane eo. Ke rile," ba latlhegile mo dipelong tsa bone ka nako tsotlhe.' Ga ba ise ba ke ba itse ditsela tsame. \v 11 Go ntse jaaka ke ikana ka tenego yame ke re: ' Ga ba kitla ba tsena mo boitapolosong jwame."
=======
\v 9 Se e ne e le fa borralona mogolo ba ingaola ka go nteka, le fa ba ntse ba bone ditiro tsame dingwaga di le masome mane. \v 10 Ka jalo, ke ne ka seka ka itumelela kokomane eo. Ke rile," Ba latlhegile mo dipelong tsa bone ka nako tsotlhe. Ga ba ise ba ke ba itse ditsela tsame." \v 11 Go ntse jaaka ke ikana ka tenego yame ke re: ' Ga ba kitla ba tsena mo boitapolosong jwame."
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\v 9 Se e ne e le fa borralona mogolo ba ingaola ka go nteka, le fa ba ntse ba bone ditiro tsame dingwaga di le masome mane. \v 10 Ka jalo, ke ne ka seka ka itumelela kokomane eo. Ke rile," Ba latlhegile mo dipelong tsa bone ka nako tsotlhe. Ga ba ise ba ke ba itse ditsela tsame." \v 11 Go ntse jaaka ke ikana ka tenego yame ke re: ' Ga ba kitla ba tsena mo boitapolosong jwame."

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 12 Elang tlhoko bakaulengwe, gore go se nne ope wa lona yoo pelo e bosula ee sa dumeleng, ee huraletseng Modimo o o tshelang. \v 13 Le fa go ntse jalo, kgothatsanang "tsatsi le letsatsi," go santse go nale nako, " go re go se nne ope wa lona yoo thatafadiwang ka tsietsego ya boleo.
=======
\v 12 Elang tlhoko bakaulengwe, gore go se nne ope wa lona yo o pelo e bosula e e sa dumeleng, e e huraletseng Modimo yo o tshelang. \v 13 Le fa go ntse jalo, kgothatsanang "letsatsi le letsatsi," go santse go nale nako, " go re go se nne ope wa lona yo o thatafadiwang ka tsietsego ya boleo.
>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
\v 12 Elang tlhoko bakaulengwe, gore go se nne ope wa lona yo o pelo e bosula e e sa dumeleng, e e huraletseng Modimo yo o tshelang. \v 13 Le fa go ntse jalo, kgothatsanang "letsatsi le letsatsi," go santse go nale nako, " go re go se nne ope wa lona yo o thatafadiwang ka tsietsego ya boleo.

View File

@ -74,6 +74,9 @@
"03-title",
"03-01",
"03-05",
"03-07",
"03-09",
"03-12",
"04-title",
"05-title",
"06-title",