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

Mon Mar 06 2017 18:05:26 GMT+0200 (CAT)

This commit is contained in:
jdwood 2017-03-06 18:05:26 +02:00
parent 9964612310
commit 9b05a08ad1
3 changed files with 3 additions and 10 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 Iswe ba Paulusi ni Timutea, bahikana ba Jesu Keresite, kwabana bonse babakungulwa cha Jesu Keresite bekele kwa Filipi, ni bakulwana ni madikoni. \v 2 Chisemo chibe nanwe ni kozo izwa kwa Ireeza Ishetu ni Simwine wetu Jesu Keresite.
=======
\c 1 \v 1 \v 2 Paulusi ni Timoteya, bahikana ba Jesu Kreste, kubonse bakungulilwe kwa Jesu Kreste bena kwa filipi,
>>>>>>> 280428cd1b5f089c28a38e3d5feaabcb7e7f04a1
\c 1 \v 1 Iswe ba Paulusi ni Timutea, bahikana ba Jesu Keresite, kwabana bonse babakungulwa cha Jesu Keresite bekele kwa Filipi, ni bakulwana ni madikoni. \v 2 Chisemo chibe nanwe ni kozo izwa kwa Ireeza Ishetu ni Simwine wetu Jesu Keresite.

6
front/title.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
Vafilipi
=======
Mafilipi
>>>>>>> 280428cd1b5f089c28a38e3d5feaabcb7e7f04a1
Vafilipi

1
manifest.json
View File

@ -42,6 +42,7 @@
"winnie Muhosho"
],
"finished_chunks": [
"front-title",
"01-title",
"01-03",
"01-07",