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

Fri Mar 10 2017 09:26:33 GMT-0500 (Eastern Standard Time)

This commit is contained in:
tsDesktop 2017-03-10 09:26:33 -05:00
parent a02f1760c6
commit 80e7198a99
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
01/18.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD \v 18 Mme ke eng? le ka tsela epe fela, go tsweng mo go iketsiseng kana mo nneteng, Keresete o a bolelwa, mme mo go se ke a ipela. Ee, ke tla ipela. \v 19 Go nne ke a itse gore se se tla mperekela mo kgololong. Se se tla diragala ka lebala la dithapelo tsa lona le thuso ya Moya wa ga Jeso Keresete.
\v 18 Mme ke eng? le ka tsela epe fela, go tsweng mo go iketsiseng kana mo nneteng, Keresete o a bolelwa, mme mo go se ke a ipela. Ee, ke tla ipela. \v 19 Go nne ke a itse gore se se tla mperekela mo kgololong. Se se tla diragala ka lebala la dithapelo tsa lona le thuso ya Moya wa ga Jeso Keresete.
=======
B
>>>>>>> ecb5d7393f1c978a3a93621e202626c01a1ab033

40
manifest.json
View File

@ -36,7 +36,8 @@
"Gopolang Mmereki", "Gopolang Mmereki",
"Ookeditse Maseko", "Ookeditse Maseko",
"Kagelelo Mokgosi", "Kagelelo Mokgosi",
"Mmotlana Emelang" "Mmotlana Emelang",
"Philip McMahon"
], ],
"finished_chunks": [ "finished_chunks": [
"01-title", "01-title",
@ -46,27 +47,11 @@
"01-09", "01-09",
"01-12", "01-12",
"01-15", "01-15",
"01-18",
"01-20", "01-20",
"01-22", "01-22",
"01-25", "01-25",
"01-28", "01-28",
"04-title",
"04-01",
"04-04",
"04-08",
"04-10",
"04-14",
"04-18",
"04-21",
"03-title",
"03-01",
"03-04",
"03-06",
"03-08",
"03-12",
"03-15",
"03-17",
"03-20",
"02-title", "02-title",
"02-01", "02-01",
"02-03", "02-03",
@ -78,6 +63,23 @@
"02-19", "02-19",
"02-22", "02-22",
"02-25", "02-25",
"02-28" "02-28",
"03-title",
"03-01",
"03-04",
"03-06",
"03-08",
"03-12",
"03-15",
"03-17",
"03-20",
"04-title",
"04-01",
"04-04",
"04-08",
"04-10",
"04-14",
"04-18",
"04-21"
] ]
} }