From f4179428df693ccd3949f1e7002e1747e92e02ac Mon Sep 17 00:00:00 2001 From: hharrissWA Date: Thu, 2 Jun 2016 14:58:22 -0600 Subject: [PATCH] removal of repitition --- 62-2PE/01.usfm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/62-2PE/01.usfm b/62-2PE/01.usfm index d5ccdf78..9eda1aa4 100644 --- a/62-2PE/01.usfm +++ b/62-2PE/01.usfm @@ -6,14 +6,9 @@ \v 2 May grace be to you; may peace increase through the knowledge of God and of Jesus our Lord. \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 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 \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.