From 4a0118856d5d60c6038465e81c7ba742a2ee986e Mon Sep 17 00:00:00 2001 From: jdwood Date: Fri, 4 Aug 2017 12:21:28 -0400 Subject: [PATCH] Fri Aug 04 2017 12:21:28 GMT-0400 (EDT) --- 04/01.txt | 6 +----- 04/03.txt | 6 +----- manifest.json | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/04/01.txt b/04/01.txt index 624e23b..99faa3c 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 4 \v 1 Ka moo, a re nneng podimatseba gore go seka ga nna le ope wa lona yo go lebegang a ka seka a fitlhelela tshephiso e le e tlogeletsweng go tsena boitapoloso jwa Modimo. \v 2 Ka gore re ne re boleletswe dikgang tse di molemo fela jaaka di ne di ntse. Mme molaetsa o wa seka wa tswela mosola ba ba neng ba seka ba lomagana mo tumelong le ba ba neng ba nna kutlo. -======= -\c 4 \v 1 Ka jalo, a re nneng kelotlhoko gore go seka ga nna le ope wa lona yo go lebegang a ka seka a fitlhelela tsholofetso e le e tlogeletsweng go tsena mo boitapolosong jwa Modimo. \v 2 Ka gore re boleletswe dikgang tse di molemo fela jaaka bone. Mme molaetsa o wa seka wa tswela mosola ba ba neng ba seka ba lomagana mo tumelong le ba ba neng ba nna kutlo. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\c 4 \v 1 Ka jalo, a re nneng kelotlhoko gore go seka ga nna le ope wa lona yo go lebegang a ka seka a fitlhelela tsholofetso e le e tlogeletsweng go tsena mo boitapolosong jwa Modimo. \v 2 Ka gore re boleletswe dikgang tse di molemo fela jaaka bone. Mme molaetsa o wa seka wa tswela mosola ba ba neng ba seka ba lomagana mo tumelong le ba ba neng ba nna kutlo. \ No newline at end of file diff --git a/04/03.txt b/04/03.txt index d39acea..a275192 100644 --- a/04/03.txt +++ b/04/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Ka gore rona ba re dumetseng ke rona ba re tla tsenang mo boitapolosong joo, fela jaaka a buile, "jaaka ke ikana mo tshakgalong yame, ga ba kitla ba tsena mo boitapolosong jwame. "Le fa go ntse jalo, ditiro tsa gagwe tse di bopilweng di ne tsa feleletswa ko motheong wa lefatshe. \v 4 Ka gore o buile golo gongwe ka letsatsi la bosupa, Modimo o ne a itapolosa ka letsatsi la bosupa go tswa mo ditirong tsotlhe tsa gagwe." \v 5 O buile gape a re, "ga ba kitla ba tsena mo boitapolosong jwame." -======= -\v 3 Ka gore rona ba re dumetseng ke rona ba re tla tsenang mo boitapolosong joo, fela jaaka a buile, "jaaka ke ikana mo bogaleng jwame, ga ba kitla ba tsena mo boitapolosong jwame. "Le fa go ntse jalo, ditiro tsa gagwe tse di bopilweng di ne tsa feleletswa ko motheong wa lefatshe. \v 4 Ka gore o buile golo gongwe ka letsatsi la bosupa, "Modimo o ne a itapolosa ka letsatsi la bosupa go tswa mo ditirong tsotlhe tsa gagwe." \v 5 O buile gape a re, "Ga ba kitla ba tsena mo boitapolosong jwame." ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 3 Ka gore rona ba re dumetseng ke rona ba re tla tsenang mo boitapolosong joo, fela jaaka a buile, "jaaka ke ikana mo bogaleng jwame, ga ba kitla ba tsena mo boitapolosong jwame. "Le fa go ntse jalo, ditiro tsa gagwe tse di bopilweng di ne tsa feleletswa ko motheong wa lefatshe. \v 4 Ka gore o buile golo gongwe ka letsatsi la bosupa, "Modimo o ne a itapolosa ka letsatsi la bosupa go tswa mo ditirong tsotlhe tsa gagwe." \v 5 O buile gape a re, "Ga ba kitla ba tsena mo boitapolosong jwame." \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8e6e432..5666bdf 100644 --- a/manifest.json +++ b/manifest.json @@ -80,6 +80,8 @@ "03-14", "03-16", "04-title", + "04-01", + "04-03", "05-title", "06-title", "06-09",