From aa32729962d4e85f7d2770dd11579f0f2944f9bc Mon Sep 17 00:00:00 2001 From: Dave Statezni Date: Thu, 28 Jul 2016 17:07:52 -0500 Subject: [PATCH] Restore Jims mods --- 60-JAS/01.usfm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/60-JAS/01.usfm b/60-JAS/01.usfm index ab1c9e08..a4e9e0ff 100644 --- a/60-JAS/01.usfm +++ b/60-JAS/01.usfm @@ -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.