Fix conflict
This commit is contained in:
parent
90a682863a
commit
234aea37d6
|
@ -8,18 +8,12 @@
|
|||
\s5
|
||||
\v 4 For if God did not spare the angels who sinned, but instead handed them down to Tartarus to be kept in chains in deep darkness until the judgment;
|
||||
\v 5 and if he did not spare the ancient world, but did preserve Noah, who was a herald of righteousness, along with seven others, but brought a flood upon the world of the ungodly
|
||||
\v 6 and reduced the cities of Sodom and Gomorrah to ashes and condemned them to destruction, as an example of what is to come to the ungodly;
|
||||
\v 6 and reduced the cities of Sodom and Gomorrah to ashes and condemned them to destruction, as an example of what is to come to the ungodly.
|
||||
|
||||
\s5
|
||||
<<<<<<< HEAD
|
||||
\v 7 And he rescued righteous Lot, who was greatly distressed by the filthy behavior of lawless men.
|
||||
\v 8 For that righteous man, living among them day after day, was tormenting his righteous soul because of what he saw and heard.
|
||||
\v 9 The Lord knows how to rescue godly men out of trials, and how to hold unrighteous men for punishment at the day of judgment.
|
||||
=======
|
||||
\v 7 and he rescued righteous Lot, who was greatly distressed by the filthy behavior of lawless men
|
||||
\v 8 (because that righteous man, living among them day after day, was tormenting his righteous soul because of what he saw and heard),
|
||||
\v 9 then Lord knows how to rescue godly men out of trials, and how to hold unrighteous men for punishment at the day of judgment.
|
||||
>>>>>>> origin/master
|
||||
|
||||
\s5
|
||||
\v 10 This is especially true for those who continue in the corrupt desires of the flesh and despise authority. They are bold and self-willed. They are not afraid to blaspheme the glorious ones.
|
||||
|
|
Loading…
Reference in New Issue