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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	62-2PE/01.usfm
This commit is contained in:
hharrissWA 2016-06-02 14:47:50 -06:00
parent aadd373efd 7646bc1a72
commit 775d040a95
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
62-2PE/01.usfm
View File

@ -6,8 +6,14 @@
\v 2 May grace be to you; may peace increase through the knowledge of God and of Jesus our Lord. \v 2 May grace be to you; may peace increase through the knowledge of God and of Jesus our Lord.
\s5 \s5
<<<<<<< HEAD
\v 3 All the things of divine power for life and godliness have been given to us through the knowledge of God, who called us through his own glory and virtue. \v 3 All the things of divine power for life and godliness have been given to us through the knowledge of God, who called us through his own glory and virtue.
\v 4 Through these, he gave us precious and great promises. He did this so that you might be sharers in the divine nature, as you escape from the corruption that is in the world in wicked desires. \v 4 Through these, he gave us precious and great promises. He did this so that you might be sharers in the divine nature, as you escape from the corruption that is in the world in wicked desires.
=======
\v 3 As all the things of divine power for life and godliness have been given to us through the knowledge of God, who called us through his own glory and virtue.
\v 4 Through these, he gave us precious and great promises. He did this so that you might be sharers in the divine nature, as you escape from the corruption that is in the world in wicked desires.
>>>>>>> origin/master
\s5 \s5
\v 5 For this same reason, do your best to gain virtue through your faith, and through your virtue, gain knowledge. \v 5 For this same reason, do your best to gain virtue through your faith, and through your virtue, gain knowledge.
\v 6 Through your knowledge, gain self-control, and through your self-control, gain endurance, and through your endurance, gain godliness. \v 6 Through your knowledge, gain self-control, and through your self-control, gain endurance, and through your endurance, gain godliness.