From a4c30b01c4928442c9dd52cce0f238a14e82e600 Mon Sep 17 00:00:00 2001 From: jdwood Date: Fri, 4 Aug 2017 12:19:28 -0400 Subject: [PATCH] Fri Aug 04 2017 12:19:28 GMT-0400 (EDT) --- 03/14.txt | 6 +----- 03/16.txt | 6 +----- manifest.json | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/03/14.txt b/03/14.txt index d92ddba..2b781a1 100644 --- a/03/14.txt +++ b/03/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Ka gore re nnile batsaya karolo le Keresete fa re tshwarelela ka thata tshepo ya rona mo go ene go simolola kwa tshimologong go ya kwa bofelong. \v 15 Ka se go builwe gatwe, "Gompieno, fa le utlwa lentswe la gagwe, lo seka lwa thatafatsa dipelo tsa lona jaaka diingaodi." -======= -\v 14 Ka gore re nnile batsaya karolo le Keresete fa re tshwarelela ka thata tshepo ya rona mo go ene go simolola kwa tshimologong go ya kwa bofelong. \v 15 Ka se go builwe gatwe, "Gompieno, fa le utlwa lentswe la gagwe, le seka la thatafatsa dipelo tsa lona mo boingaoding." ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 14 Ka gore re nnile batsaya karolo le Keresete fa re tshwarelela ka thata tshepo ya rona mo go ene go simolola kwa tshimologong go ya kwa bofelong. \v 15 Ka se go builwe gatwe, "Gompieno, fa le utlwa lentswe la gagwe, le seka la thatafatsa dipelo tsa lona mo boingaoding." \ No newline at end of file diff --git a/03/16.txt b/03/16.txt index be8f1af..319983b 100644 --- a/03/16.txt +++ b/03/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Ke mang ene yoo utlwileng Modimo a bo a ingaola?A ga se ba ba neng ba tswa Egepeto ka Moshe? \v 17 Bone baa neng a ba galefetse dingwaga tse di masome mane? A ga se bone ba ba neng ba leofile, ba ditopo tsa bone di wetseng mo sekakeng? \v 18 Ba a ikanneng gore ga ba kitla ba tsena mo boitapolosong, fa e ne e se ka ba ba mo tlhoketseng kutlo? \v 19 Re bona gore ba ne ba ka seke ba tsene mo boikhutsong ka lebaka la go tlhoka go dumela. -======= -\v 16 Ke mang ene yo o utlwileng Modimo a bo a ingaola?A ga se ba ba neng ba tswa Egepeto ka Moshe? \v 17 Bone ba a neng a ba galefetse dingwaga tse di masome mane? A ga se bone ba ba neng ba leofile, ba ditopo tsa bone di wetseng mo sekakeng? \v 18 Ke bafe ba a ba ikanetseng gore ga ba kitla ba tsena mo boitapolosong, fa e ne e se ba ba mo tlhoketseng kutlo? \v 19 Re bona gore ba ne ba seka ba kgona go tsena mo boitapolosong ka lebaka la go tlhoka go dumela. ->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4 +\v 16 Ke mang ene yo o utlwileng Modimo a bo a ingaola?A ga se ba ba neng ba tswa Egepeto ka Moshe? \v 17 Bone ba a neng a ba galefetse dingwaga tse di masome mane? A ga se bone ba ba neng ba leofile, ba ditopo tsa bone di wetseng mo sekakeng? \v 18 Ke bafe ba a ba ikanetseng gore ga ba kitla ba tsena mo boitapolosong, fa e ne e se ba ba mo tlhoketseng kutlo? \v 19 Re bona gore ba ne ba seka ba kgona go tsena mo boitapolosong ka lebaka la go tlhoka go dumela. \ No newline at end of file diff --git a/manifest.json b/manifest.json index fa8534e..8e6e432 100644 --- a/manifest.json +++ b/manifest.json @@ -77,6 +77,8 @@ "03-07", "03-09", "03-12", + "03-14", + "03-16", "04-title", "05-title", "06-title",