From d70496b93576189a802289bd6ed64be05e54f64a Mon Sep 17 00:00:00 2001 From: jdwood Date: Fri, 4 Aug 2017 12:25:28 -0400 Subject: [PATCH] Fri Aug 04 2017 12:25:28 GMT-0400 (EDT) --- 04/08.txt | 6 +----- 04/12.txt | 6 +----- 04/14.txt | 6 +----- manifest.json | 3 +++ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/04/08.txt b/04/08.txt index 5028c30..76d3f27 100644 --- a/04/08.txt +++ b/04/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Ka gore fa ele gore Joshua o ba file boitapoloso, Modimo o ka bo a sa bua ka letsatsi le lengwe. \v 9 Ka moo go santse go na le letsatsi la Sabata le le beetsweng batho ba Modimo. \v 10 Ka gore yo o tsenang mo boitapolosong jwa Modimo o setse a itapolositse mo ditirong tsa gagwe, fela jaaka Modimo a dirile go tswa mo go tsa gagwe. \v 11 Ka jalo a re eletseng go tsena mo boitapolosong joo, gore go sena ope yo o tla dirang botlhoka kutlo jo ba bo dirileng. -======= -\v 8 Ka gore fa e le gore Joshua o ba file boitapoloso, Modimo o ka bo a sa bua ka letsatsi le lengwe. \v 9 Ka jalo go santse go na le letsatsi la Sabata le le beetsweng batho ba Modimo. \v 10 Ka gore yo o tsenang mo boitapolosong jwa Modimo o setse a itapolositse mo ditirong tsa gagwe, fela jaaka Modimo a dirile go tswa mo go tsa gagwe. \v 11 Ka jalo a re eletseng go tsena mo boitapolosong joo, gore go se nne ope yo o tla dirang botlhoka kutlo jo ba bo dirileng. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 8 Ka gore fa e le gore Joshua o ba file boitapoloso, Modimo o ka bo a sa bua ka letsatsi le lengwe. \v 9 Ka jalo go santse go na le letsatsi la Sabata le le beetsweng batho ba Modimo. \v 10 Ka gore yo o tsenang mo boitapolosong jwa Modimo o setse a itapolositse mo ditirong tsa gagwe, fela jaaka Modimo a dirile go tswa mo go tsa gagwe. \v 11 Ka jalo a re eletseng go tsena mo boitapolosong joo, gore go se nne ope yo o tla dirang botlhoka kutlo jo ba bo dirileng. \ No newline at end of file diff --git a/04/12.txt b/04/12.txt index 4ade56f..2692a72 100644 --- a/04/12.txt +++ b/04/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Ka gore lefoko la Modimo le a tshela ebile le a dira, ebile le bogale go feta tshaka e e magale mabedi. Le phunyeletsa le tlhaba go kgaoganya botshelo le mowa, le ditokololo le moko. Le kgona go itse dikakanyo le maikaelelo a pelo. \v 13 Ga gona sepe se se bopilweng se se fitlhegileng fa pele ga Modimo. Le fa go ntse jalo, sengwe le sengwe se bulegile fa pele ga matlho a ene yo re tshwanetseng go arabela ko go ene. -======= -\v 12 Ka gore lefoko la Modimo le a tshela ebile le a dira, le bogale go feta tshaka e e magale mabedi. Le phunyeletsa le tlhabe go kgaoganya maikutlo le moya, le ditokololo le moko. Le kgona go itse dikakanyo le maikaelelo a pelo. \v 13 Ga gona sepe se se bopilweng se se fitlhegileng fa pele ga Modimo. Le fa go ntse jalo, sengwe le sengwe se bulegile fa pele ga matlho a ene yo re tshwanetseng go arabela ko go ene. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 12 Ka gore lefoko la Modimo le a tshela ebile le a dira, le bogale go feta tshaka e e magale mabedi. Le phunyeletsa le tlhabe go kgaoganya maikutlo le moya, le ditokololo le moko. Le kgona go itse dikakanyo le maikaelelo a pelo. \v 13 Ga gona sepe se se bopilweng se se fitlhegileng fa pele ga Modimo. Le fa go ntse jalo, sengwe le sengwe se bulegile fa pele ga matlho a ene yo re tshwanetseng go arabela ko go ene. \ No newline at end of file diff --git a/04/14.txt b/04/14.txt index 5283e20..920cac8 100644 --- a/04/14.txt +++ b/04/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Ka jalo, e re ka re na le moperesita yo mogolo yo o fitileng fa ga re ga magodimo, Jeso morwa Modimo, a re tshwareleleng ka thata ditumelo tsa rona. \v 15 Ka gore ga re na Moperesita mogolo yo o ka re utlwelang botlhoko ka makoa a rona. Le fa go ntse jalo, re na le mongwe yo o lekilweng ka ditsela tsotlhe fela jaaka re lekwa, ko ntleng fela ga gore ga a na sebe. \v 16 A re tsamaeng ka matlhagatlhaga ko toroneng ya tshegofatso, gore re kgone go amogela maitlwelobotlhoko le tshegofatso go thusa ka nako ya botlhoki. -======= -\v 14 Ka jalo, e re ka re na le moperesiti yo mogolo yo o fetileng fa gare ga magodimo, Jeso Morwa Modimo, a re tshwareleleng ka thata tumelo ya rona. \v 15 Ka gore re na Moperesiti mogolo yo o ka re utlwelang botlhoko mo makoeng a rona. Le fa go ntse jalo, re na le mongwe yo o lekilweng ka ditsela tsotlhe fela jaaka re lekwa, ko ntleng fela ga gore ga a na sebe. \v 16 A re tsamaeng ka botlhokapoifo ko setilong sa bogosi sa tshegofatso, gore re kgone go amogela mautlwelobotlhoko le tshegofatso go re thusa ka nako ya botlhoki. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 14 Ka jalo, e re ka re na le moperesiti yo mogolo yo o fetileng fa gare ga magodimo, Jeso Morwa Modimo, a re tshwareleleng ka thata tumelo ya rona. \v 15 Ka gore re na Moperesiti mogolo yo o ka re utlwelang botlhoko mo makoeng a rona. Le fa go ntse jalo, re na le mongwe yo o lekilweng ka ditsela tsotlhe fela jaaka re lekwa, ko ntleng fela ga gore ga a na sebe. \v 16 A re tsamaeng ka botlhokapoifo ko setilong sa bogosi sa tshegofatso, gore re kgone go amogela mautlwelobotlhoko le tshegofatso go re thusa ka nako ya botlhoki. \ No newline at end of file diff --git a/manifest.json b/manifest.json index b6d2231..6a11a09 100644 --- a/manifest.json +++ b/manifest.json @@ -83,6 +83,9 @@ "04-01", "04-03", "04-06", + "04-08", + "04-12", + "04-14", "05-title", "06-title", "06-09",