From 721207b8a79be218806e9451bf6cc31ddddc6334 Mon Sep 17 00:00:00 2001 From: stewardd Date: Thu, 8 Mar 2018 20:33:45 +0200 Subject: [PATCH] Thu Mar 08 2018 20:33:45 GMT+0200 (South Africa Standard Time) --- 07/08.txt | 6 +----- manifest.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/07/08.txt b/07/08.txt index d97f2e6..c5ec0df 100644 --- a/07/08.txt +++ b/07/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Le fa lekwalo lame le le utlwisitse botlhoko, ga ke go ikotlhaele. Mme ke a ikotlhaya fa ke bona gore lekwalo lame le le utlwisa botlhoko. Mme lene le utlwile botlhoko ka sebakanyana. \v 9 Jaanong ke a itumela, e seng ka gore le ne le le mo pitlaganong, mme kutlobotlhoko ya lona e le dirile gore le ikwatlhae. Le itemogetse kutlhobotlhoko ya bo modimo, ka jalo ga lo a latlhegelwa ke sepe ka ntlha ya rona. \v 10 Gonne kutlhoboko ya bo modimo e tlisa boikwatlhao jo bo tlisang poloko go sena makotlhao. Kutlobotlhoko ya selefatshe yone e tlisa loso. -======= -E ne e se ka go goroga ga gagwe fela mo Modimong a re gomoditseng ka gone e ne \v 8 \v 9 \v 10 Le fa lekwalo la me le le hutsahaditseng, ga ke le ikotlhaela. Mme ke ne ka ikotlhaa fa ke sena go bona gore lekwalo lame le le hutsahaditse. Mme le ne le hutsahetse ka nakwana. Jaanong ke itumetse, e se ka gore le ne le utlwile botlhoko, mme ka gore bohutsana jwa lona ba le tsiseditse boikotlhao, jo bo diragetseng poloko kwa ntle ga go ikotlhaa. ->>>>>>> f21309c57fcac4ac6bdc06d8023ec8caf2924a80 +\v 8 Le fa lekwalo lame le le utlwisitse botlhoko, ga ke go ikotlhaele. Mme ke a ikotlhaya fa ke bona gore lekwalo lame le le utlwisa botlhoko. Mme lene le utlwile botlhoko ka sebakanyana. \v 9 Jaanong ke a itumela, e seng ka gore le ne le le mo pitlaganong, mme kutlobotlhoko ya lona e le dirile gore le ikwatlhae. Le itemogetse kutlhobotlhoko ya bo modimo, ka jalo ga lo a latlhegelwa ke sepe ka ntlha ya rona. \v 10 Gonne kutlhoboko ya bo modimo e tlisa boikwatlhao jo bo tlisang poloko go sena makotlhao. Kutlobotlhoko ya selefatshe yone e tlisa loso. \ No newline at end of file diff --git a/manifest.json b/manifest.json index c9a7edf..97a60bd 100644 --- a/manifest.json +++ b/manifest.json @@ -108,6 +108,7 @@ "07-01", "07-02", "07-05", + "07-08", "07-11", "07-13", "07-15",