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

Sat Jul 29 2017 17:30:10 GMT+0200 (South Africa Standard Time)

This commit is contained in:
tsDesktop 2017-07-29 17:30:10 +02:00
parent 6f490f0009
commit c6849be07a
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
01/01.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD \c 1 \v 1 Paulo, moaposetolo wa ga Jeso Keresete ka thato ya Modimo, Le Timotheo morwaarona, go yeng ko kerekeng ya Modimo e e ko Korinta, le badumedi botlhe ba ba mo kgaolong ya Akasia. \v 2 A tsogofatso ene mo go lona le kagiso e tswang ko go Modimo Rara le Morena Jeso Keresete.
\c 1 \v 1 Paulo, moaposetolo wa ga Jeso Keresete ka thato ya Modimo, Le Timotheo morwaarona, go yeng ko kerekeng ya Modimo e e ko Korinta, le badumedi botlhe ba ba mo kgaolong ya Akasia. \v 2 A tsogofatso ene mo go lona le kagiso e tswang ko go Modimo Rara le Morena Jeso Keresete.
=======
\c 1 \v 1 \v 2 Jalo ke ikaeletse ka
>>>>>>> 1b40dfaeaedc4b6af1acce2af10d7d9cbb5e1758

22
manifest.json
View File

@ -35,11 +35,13 @@
"translators": [ "translators": [
"Tebogo Tshenyego", "Tebogo Tshenyego",
"GOPOLANG MMEREKI", "GOPOLANG MMEREKI",
"david ntsima" "david ntsima",
"Mondele Kpanga"
], ],
"finished_chunks": [ "finished_chunks": [
"front-title", "front-title",
"01-title", "01-title",
"01-01",
"01-03", "01-03",
"01-05", "01-05",
"01-08", "01-08",
@ -50,14 +52,6 @@
"01-19", "01-19",
"01-21", "01-21",
"01-23", "01-23",
"13-title",
"13-01",
"13-03",
"13-05",
"13-07",
"13-09",
"13-11",
"13-13",
"02-title", "02-title",
"02-01", "02-01",
"02-03", "02-03",
@ -66,6 +60,14 @@
"02-10", "02-10",
"02-12", "02-12",
"02-14", "02-14",
"02-16" "02-16",
"13-title",
"13-01",
"13-03",
"13-05",
"13-07",
"13-09",
"13-11",
"13-13"
] ]
} }