From d055bf88a9ec2ffc1b9a4b55ac1fe5f9d2e96a94 Mon Sep 17 00:00:00 2001 From: jdwood Date: Fri, 4 Aug 2017 12:31:28 -0400 Subject: [PATCH] Fri Aug 04 2017 12:31:28 GMT-0400 (EDT) --- 06/01.txt | 6 +----- 06/04.txt | 6 +----- manifest.json | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/06/01.txt b/06/01.txt index 8de79e1..57fa982 100644 --- a/06/01.txt +++ b/06/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 6 \v 1 Jalo, a re tlogeleng tshimologo ya molaetsa wa ga Keresete mme re ye ko kgolong. A re seka ra baya gape motheo wa ikotlhao mo ditirong tse di suleng le wa tumelo mo Modimong, \v 2 kana motheo wa go ruta ka dikolobetso, go baya diatla, tsogo ya baswi le katlholo ya bosakhutleng. \v 3 Re tlaa dira se fa Modimo a letlelela. -======= -\c 6 \v 1 Jalo, a re tlogeleng tshimologo ya molaetsa wa ga Keresete mme re ye ko pele go gola. A re seka ra baya gape motheo wa go ikotlhaya mo ditirong tse di suleng le wa tumelo mo Modimong, \v 2 kana motheo wa go ruta ka dikolobetso, go baya diatla, tsogo ya baswi le katlholo ya bosakhutleng. \v 3 Re tlaa dira se fa Modimo a letlelela. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\c 6 \v 1 Jalo, a re tlogeleng tshimologo ya molaetsa wa ga Keresete mme re ye ko pele go gola. A re seka ra baya gape motheo wa go ikotlhaya mo ditirong tse di suleng le wa tumelo mo Modimong, \v 2 kana motheo wa go ruta ka dikolobetso, go baya diatla, tsogo ya baswi le katlholo ya bosakhutleng. \v 3 Re tlaa dira se fa Modimo a letlelela. \ No newline at end of file diff --git a/06/04.txt b/06/04.txt index 124bc3e..f7175be 100644 --- a/06/04.txt +++ b/06/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Ka gago kgonagale mogo bao ba kileng ba bona lesedi, ba utlwile mpho ya selegodimo ebile ba amogane Mowa yo o Boitshepo, \v 5 le bao ba ba utlwileng lefoko le le molemo la Modimo le maatla a nako tse di tlang, \v 6 bao ba kgelogileng-ga go kgonagale go ba busetsa gape ko boikotlhaong. Se ke ka ntlha ya gore ba ipapolela morwa Modimo gape, ba bo ba mo tlhabisa ditlhong mo setshabeng. -======= -\v 4 Ka gago kgonagale mogo bao ba kileng ba bona lesedi, ba utlwile mpho ya selegodimo ebile ba amogane Moya o o Boitshepo, \v 5 le bao ba ba utlwileng lefoko le le molemo la Modimo le maatla a nako tse di tlang, \v 6 bao ba kgelogileng-ga go kgonagale go ba busetsa gape ko boikotlhaong. Se ke ka ntlha ya gore ba ipapolela Morwa Modimo gape, ba bo ba mo tlhabisa ditlhong mo setshabeng. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 4 Ka gago kgonagale mogo bao ba kileng ba bona lesedi, ba utlwile mpho ya selegodimo ebile ba amogane Moya o o Boitshepo, \v 5 le bao ba ba utlwileng lefoko le le molemo la Modimo le maatla a nako tse di tlang, \v 6 bao ba kgelogileng-ga go kgonagale go ba busetsa gape ko boikotlhaong. Se ke ka ntlha ya gore ba ipapolela Morwa Modimo gape, ba bo ba mo tlhabisa ditlhong mo setshabeng. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 43ff737..b728f83 100644 --- a/manifest.json +++ b/manifest.json @@ -94,6 +94,8 @@ "05-09", "05-12", "06-title", + "06-01", + "06-04", "06-09", "07-title", "08-title",