From b07780eac9a6f91d3db0e60231fc1bf81c3a3f63 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Sat, 11 Mar 2017 08:56:09 -0500 Subject: [PATCH] Sat Mar 11 2017 08:56:09 GMT-0500 (Eastern Standard Time) --- 01/08.txt | 6 +----- 01/title.txt | 6 +----- front/title.txt | 6 +----- manifest.json | 3 ++- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/01/08.txt b/01/08.txt index e8b017d..ca5a27f 100644 --- a/01/08.txt +++ b/01/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -K -======= -\v 8 Ga le ise le mmone, mme le a mo rata. Ga le mmone gompieno, mme le dumela mo go ene mme le itumetse mo go sa buiweng, boitumelo jo bo galalelang. \v 9 Jaanong le a ikamogelela maduo a tumelo ya lona, le poloko ya moya wa lona. \v 10 Baporofite ba batlisisitse ba bo ba botsisisa ka poloko ena, ka tshegofatso e tla nnang ya lona. ->>>>>>> 9d3b7747f2b28ed413c5e5c24b06ac3e59d6f13e +\v 8 Ga le ise le mmone, mme le a mo rata. Ga le mmone gompieno, mme le dumela mo go ene mme le itumetse mo go sa buiweng, boitumelo jo bo galalelang. \v 9 Jaanong le a ikamogelela maduo a tumelo ya lona, le poloko ya moya wa lona. \v 10 Baporofite ba batlisisitse ba bo ba botsisisa ka poloko ena, ka tshegofatso e tla nnang ya lona. \ No newline at end of file diff --git a/01/title.txt b/01/title.txt index 256673f..cc2237d 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kgaolo -======= -Kgaolo 1 ->>>>>>> 9d3b7747f2b28ed413c5e5c24b06ac3e59d6f13e +Kgaolo 1 \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index c4a8818..4c06c41 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -1Petere -======= -1 Petere 1 ->>>>>>> 9d3b7747f2b28ed413c5e5c24b06ac3e59d6f13e +1 Petere 1 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7a1ca17..10d7985 100644 --- a/manifest.json +++ b/manifest.json @@ -36,7 +36,8 @@ "Gopolang Mmereki", "Mmotlana Emelang", "Kagelelo Mokgosi", - "Ookeditse Maseko" + "Ookeditse Maseko", + "Phil" ], "finished_chunks": [ "03-title",