From 785748a48f38cf9aaf2fb1fefe8f13b6328ac736 Mon Sep 17 00:00:00 2001 From: pohlig Date: Thu, 28 Jul 2016 18:14:20 -0400 Subject: [PATCH] Update 01.usfm --- 60-JAS/01.usfm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/60-JAS/01.usfm b/60-JAS/01.usfm index a4e9e0ff..50cdfc1b 100644 --- a/60-JAS/01.usfm +++ b/60-JAS/01.usfm @@ -40,13 +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.