jessy_brown
/
tn_1pe_text_reg
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Sat Mar 11 2017 08:56:09 GMT-0500 (Eastern Standard Time)

This commit is contained in:
tsDesktop 2017-03-11 08:56:09 -05:00
parent 55dba63c09
commit b07780eac9
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
01/08.txt
View File

@ -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.

6
01/title.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
Kgaolo
=======
Kgaolo 1
>>>>>>> 9d3b7747f2b28ed413c5e5c24b06ac3e59d6f13e
Kgaolo 1

6
front/title.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
1Petere
=======
1 Petere 1
>>>>>>> 9d3b7747f2b28ed413c5e5c24b06ac3e59d6f13e
1 Petere 1

3
manifest.json
View File

@ -36,7 +36,8 @@
"Gopolang Mmereki",
"Mmotlana Emelang",
"Kagelelo Mokgosi",
"Ookeditse Maseko"
"Ookeditse Maseko",
"Phil"
],
"finished_chunks": [
"03-title",