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

02/16.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 16 Ka gonne ga a tshwenyega ka baengele; mme o tshwenyegile ka peo ya ga Aborehame. \v 17 Go botlhokwa go tshwana le barwarraagwe ka tsela tsotlhe, gore o tla nna moperesita yoo mogolo yoo kutlwelo botlhoko le boikanyego mo dilong tsa Modimo,  gore a tle a ba itshwarele maleo a bone. \v 18 Ka gore Jeso ka sebele o sotlwile o a bo a raelwa, ka jalo o thusa ba ba mo thaelong.
-=======
 \v 16 Ka gonne ga a tshwenyega ka baengele; mme o tshwenyegile ka peo ya ga Aborehama. \v 17 Jalo, go ne go le botlhokwa gore a tshwane le barwarraagwe ka ditsela tsotlhe, gore a tle a nne moperesiti mogolo yo o kutlwelo botlhoko le boikanyego mo dilong tsa Modimo, le gore a tle a ba itshwarele maleo a batho. \v 18 Ka gore Jeso ka sebele o bogile a bo a raelwa, ka jalo o kgona go thusa ba ba mo thaelong.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4

03/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 3 \v 1 Ka jalo bakaulengwe ba ba itshepileng, lo arogana pitso ya selegodimo. Akanyang ka Jeso, moaposetole le moporofiti mogolo wa boipolelo jwa rona. \v 2 O ne a ikanyega mo Modimong, yo a mo tlhomileng, fela jaaka Moshe a ne a ikanyega mo ntlong ya Modimo. \v 3 Gonne Jeso  o kailwe a tshwanetswe ke kgalalelo e kgolo go feta Moshe, go nne yoo agileng ntlo o nale tlotlo e kgolo go feta ntlo. \v 4 Gonne ntlo nngwe le nngwe e agilwe ke motho, mme yoo agileng dilo tsotlhe ke Modimo.
-=======
 \c 3 \v 1 Ka jalo, bakaulengwe ba ba itshepileng, lo kopanetse pitso ya selegodimo. Akanyang ka Jeso, moaposetolo le moperesiti mogolo wa boipolelo jwa rona. \v 2 O ne a ikanyega mo Modimong, yo a mo tlhomileng, fela jaaka Moshe a ne a ikanyega mo ntlong ya Modimo. \v 3 Gonne Jeso  o kailwe a tshwanetswe ke kgalalelo e kgolo go feta Moshe, go nne yo o agileng ntlo o nale tlotlo e kgolo go feta ntlo. \v 4 Gonne ntlo nngwe le nngwe e agilwe ke motho, mme yo o agileng dilo tsotlhe ke Modimo.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4

03/05.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 Ka ntlha e nngwe, Moshe o ne a ikanyega jaaka motlhanka mo ntlong ya Modimo. E ne ele mopaki ka dilo tsotlhe tse di tlaa diragalang mo nakong ee tlang. \v 6 Keresete ke morwa yoo mo taolong ya ntlo ya Modimo. Re  ntlo ya gagwe fa re tshwarelela mo kgothalong ya rona le mo tshepong e re ikgatlhang ka yone.
-=======
 \v 5 Ka ntlha e nngwe, Moshe o ne a ikanyega jaaka motlhanka mo ntlong yotlhe ya Modimo. O ne a le bopaki ka dilo tsotlhe tse di tla a diragalang mo nakong e e tlang. \v 6 Keresete ke Morwa yo o mo taolong ya ntlo ya Modimo. Re  ntlo ya gagwe fa re tshwarelela mo kgothalong ya rona le mo tshepong e re ikgatlhang ka yone.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4

03/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Kgaolo ya boraro
-=======
 Kgaolo 3
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4

manifest.json

@@ -70,6 +70,10 @@
 		"02-09",
 		"02-11",
 		"02-13",
+		"02-16",
+		"03-title",
+		"03-01",
+		"03-05",
 		"04-title",
 		"05-title",
 		"06-title",