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

10/17.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17 Mme maleo a bone le bosula jwa bone ga nkitla ke di gakologelwa.´´  \v 18  Mme jaanong kwa boitshwarelo jwa tsone boleng teng gago tlhole go na le setlhabelo ka ntlha ya boleo.
-=======
-\v 17 Mme maleo a bone le maikepo a bone ga nkitla ke di gakologelwa.'' \v 18  Mme jaanong kwa boitshwarelo jwa tsone boleng teng, gago tlhole go na le setlhabelo ka ntlha ya boleo.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
+\v 17 Mme maleo a bone le maikepo a bone ga nkitla ke di gakologelwa.'' \v 18  Mme jaanong kwa boitshwarelo jwa tsone boleng teng, gago tlhole go na le setlhabelo ka ntlha ya boleo.

10/19.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 19 Jaanong, bakaulengwe, re na le go tlhoka poifo go tsena mo lefelong lele boitshepo ka madi a Jeso. \v 20 E o ke yone tsela e ntsha ya go tshela e a  re e buletseng sesiro, ke ka nama ya gagwe. \v 21 Ka gore re na le moperesite o mogolo mo godimo  ga ntlo ya Modimo, \v 22  a re tseneng ka dipelo tse di boammaruri ka botlalo jwa tlhomamisa ya tumelo, re nale dipelo tsedi tlhatswitsweng mo letswalong le le bosulo mebele ya rona e tlhatswitswe ka metsi a a itshekileng.
-=======
-\v 19 Jaanong, bakaulengwe, re na le botlhokapoifo go tsena mo lefelong lele boitshepo ja boitshepo ka madi a Jeso. \v 20 E o ke tsela e ntsha ya go tshela e a  re buletseng sesiro ka yone, ke gore, ka nama ya gagwe. \v 21 Ka gore re na le moperesiti yo mogolo mo ntlong ya Modimo, \v 22  a re tseneng ka dipelo tse di boammaaruri ka botlalo jwa tlhomamiso ya tumelo, re na le dipelo tsedi tlhatswitsweng mo letswalong le le bosula mebele ya rona e tlhatswitswe ka metsi a a itshekileng.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
+\v 19 Jaanong, bakaulengwe, re na le botlhokapoifo go tsena mo lefelong lele boitshepo ja boitshepo ka madi a Jeso. \v 20 E o ke tsela e ntsha ya go tshela e a  re buletseng sesiro ka yone, ke gore, ka nama ya gagwe. \v 21 Ka gore re na le moperesiti yo mogolo mo ntlong ya Modimo, \v 22  a re tseneng ka dipelo tse di boammaaruri ka botlalo jwa tlhomamiso ya tumelo, re na le dipelo tsedi tlhatswitsweng mo letswalong le le bosula mebele ya rona e tlhatswitswe ka metsi a a itshekileng.

10/23.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 23 A rotlhe re tshwaraganeng  thata mo boipolelong jo bo solofetsweng, ntle le go kgarakgatshegaka, ka gore Modimo yo o re solofeditseng, o boikanyego.  \v 24 A re lebeleleng go kgothatsanya  ka go rata le  ka ditiro tse dintle. \v 25 A re seka ra emisa go kopana jaaka ba bangwe ba dirile. Ka jalo, are kgothatsaneng kgapetsakgapetsa, jaaka re bona letsatsi le atamela.
-=======
-\v 23 A re tshwareng ka thata boipolelo jwa tsholofelo ya rona, ntle le go reketla, ka gore Modimo yo o re solofeditseng, o boikanyego. \v 24 A re lebeleleng ka fa re ka kgothatsanyang  ka teng mo leratong le ditiro tse molemo. \v 25 A re seka ra emisa go kopana jaaka ba bangwe ba dirile. Ka jalo, a re kgothatsaneng kgapetsakgapetsa, jaaka re bona letsatsi le atamela.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
+\v 23 A re tshwareng ka thata boipolelo jwa tsholofelo ya rona, ntle le go reketla, ka gore Modimo yo o re solofeditseng, o boikanyego. \v 24 A re lebeleleng ka fa re ka kgothatsanyang  ka teng mo leratong le ditiro tse molemo. \v 25 A re seka ra emisa go kopana jaaka ba bangwe ba dirile. Ka jalo, a re kgothatsaneng kgapetsakgapetsa, jaaka re bona letsatsi le atamela.

manifest.json

@@ -141,6 +141,9 @@
 		"10-08",
 		"10-11",
 		"10-15",
+		"10-17",
+		"10-19",
+		"10-23",
 		"11-title",
 		"12-title",
 		"13-title",