rbnswartz
/
test_ulb
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Merge pull request #177 from destatez/RestoreJims 

Restore Jims mods
This commit is contained in:
David Statezni 2016-07-28 17:08:37 -05:00 committed by GitHub
parent 7eb28ff41b aa32729962
commit da4aef8469
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
60-JAS/01.usfm
View File

@ -40,8 +40,13 @@
\s5
\v 22 Be doers of the word and not only hearers, deceiving yourselves.
\v 23 For if anyone is a hearer of the word but not a doer, he is like a man who examines his natural face in a mirror.
<<<<<<< HEAD
\v 24 He examines himself and then goes away and immediately forgets what he was like.
\v 25 But the person who looks carefully into the perfect law of freedom, and continues to do so, not just being a hearer who forgets, this man will be blessed in his actions.
=======
\v 24 He examines himself and then goes away and soon forgets what he was like.
\v 25 But the person who looks carefully into the perfect law, the law of liberty, and remains so, not just being a hearer who forgets, this man will be blessed in his doing it.
>>>>>>> parent of a1dbcb9... Update final reading Bram
\s5
\v 26 If anyone thinks himself to be religious, but if he does not control his tongue, he deceives his heart, and his religion is worthless.