RPP
/
en_udb
9
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Update 02.usfm

This commit is contained in:
pohlig 2016-06-01 17:07:47 -04:00
parent ef410aac57
commit 50a35e4973
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
63-1JN/02.usfm
View File

@ -10,7 +10,7 @@
\s5
\v 4 Those who say, "We know God," and do not obey what God commands us to do, are liars. They are not conducting their lives according to God's true message.
\v 5 But those who obey what God commands them to do are the people who love God in every way. This is how we can be sure that we are joined with God.
\v 6 If we say that we are living as God wants us to, we should conduct our lives as Christ did.
\v 6 If we say that we are in union with God, we should conduct our lives as Christ did.
\s5
\p
@ -30,11 +30,8 @@
\s5
\p
<<<<<<< HEAD
\v 15 Do not behave like the people in the world who do not honor God. Do not desire the things they want to have. If anyone lives like they live, they are proving they do not love God our Father.
=======
\v 15 Do not behave like the people in the world who do not honor God. Do not desire the things they want to have. If anyone lives like they live, they are proving they do not love God our Father.
>>>>>>> origin/master
\v 16 I write this, because all the wrong things that people do, all the things that people see and try to obtain for themselves, and all the things that they boast about—all these things have nothing to do with our Father in heaven. They belong to the world.
\v 17 The people in the world who do not honor God, along with everything that they desire, will disappear. But those who do what God wants them to do will live forever!