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

Thu Mar 08 2018 20:32:14 GMT+0200 (South Africa Standard Time)

This commit is contained in:
stewardd 2018-03-08 20:32:14 +02:00
parent d728f9edb9
commit e603a26145
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
07/02.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 2 Re beeleng bonno! Ga re a direla ope bosula. Ga re a tlhokofatsa ope le fa e le go ikgagapelela mo go ope. \v 3 Ga se gore ke lo baya molato fa ke bua se. Gonne ke setse ke buile gore lo mo dipelong tsa rona, gore re tle re swe mmogo le go tshela mmogo. \v 4 Ke na le tshepo e kgolo mo go lona, ebile ke motlotlo ka lona. Ke tletse ka kgomotso. Ke penologa ka boitumelo le mo ditlhokofatsong tshotlhe tsa rona.
=======
\v 2 \v 3 \v 4 Re amogeleng! Gare a fosetsa ope. Gare a utlwisa ope botlhoko kana ra gobelela ope. 2 Ga se go le atlhola fa o bua. Gonne ke setse ke rile le mo dipelo tsa rona gore re kgona go swa re bo re tshela mmogo. 4 Ke na le tlhomamiso mo go lona e bile ke ikgontsha ka lona. Ke tletse ka kgomotsego. Ke penologa ka boitumelo le mo ditlhokofatsong tsa rona tsotlhe.
>>>>>>> f21309c57fcac4ac6bdc06d8023ec8caf2924a80
\v 2 \v 3 \v 4 Re amogeleng! Gare a fosetsa ope. Gare a utlwisa ope botlhoko kana ra gobelela ope. 2 Ga se go le atlhola fa o bua. Gonne ke setse ke rile le mo dipelo tsa rona gore re kgona go swa re bo re tshela mmogo. 4 Ke na le tlhomamiso mo go lona e bile ke ikgontsha ka lona. Ke tletse ka kgomotsego. Ke penologa ka boitumelo le mo ditlhokofatsong tsa rona tsotlhe.

6
07/05.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 5 E rile fa re goroga kwa Mesotonia, mebele ya rona e ne e sena boikhutso. Mo boemong, re ne re tshwenyegile ka tsela tsotlhe ka dikgotlhang tse di kwa ntle le dipoifo tse di mo teng. \v 6 Mme Modimo, yo o gomotsang ba ba maikutlo a a kwa tlase, a re gomotsa ka go goroga ga ga Tito. \v 7 E ne e se fela ka goroga ga gawe gore Modimo a bo a re gomoditse. Gape e ne e le ka kgomotso e Tito a e amogetseng go tswa mo go lona. O re boleletse ka fa lo re ratang thata ka teng, bohutsana jwa lona, le ka fa le tshwenyegileng thata ka ga me. Ka jalo ka itumela le go feta.
=======
\v 5 \v 6 \v 7 Fa re ya ko Makatonia, mebele ya rona e ne e sa itapolosa, mme re ne re tshwanetswe ka ditsela tsotlhe ke dikgotlang kwa ntle le poifo mo teng. 6 Mme Modimo yo o kgothatsang ba ba kgobegileng marapo, a re gomoditse ka go goroga ga ga Tito. 7 E ne e se ka go goroga ga gagwe fela mo Modimong a re gomoditseng ka gone e ne e le ka kgomotso e Tito a e bonyeng mo go lona. O re boleletse ka go lerato le legolo, kutlobotlhoko ya lona, le go tshwenyega ga nna mo go golo. Kene ka itumela le go feta.
>>>>>>> f21309c57fcac4ac6bdc06d8023ec8caf2924a80
\v 5 \v 6 \v 7 Fa re ya ko Makatonia, mebele ya rona e ne e sa itapolosa, mme re ne re tshwanetswe ka ditsela tsotlhe ke dikgotlang kwa ntle le poifo mo teng. 6 Mme Modimo yo o kgothatsang ba ba kgobegileng marapo, a re gomoditse ka go goroga ga ga Tito. 7 E ne e se ka go goroga ga gagwe fela mo Modimong a re gomoditseng ka gone e ne e le ka kgomotso e Tito a e bonyeng mo go lona. O re boleletse ka go lerato le legolo, kutlobotlhoko ya lona, le go tshwenyega ga nna mo go golo. Kene ka itumela le go feta.

2
manifest.json
View File

@ -106,6 +106,8 @@
"06-17",
"07-title",
"07-01",
"07-02",
"07-05",
"07-11",
"07-13",
"07-15",