Merge remote-tracking branch 'origin/master'

# Conflicts:
#	62-2PE/02.usfm
This commit is contained in:
Tom Warren 2016-06-03 10:32:50 -04:00
commit 90a682863a
15 changed files with 35 additions and 35 deletions

View File

@ -53,23 +53,23 @@
\v 26 Now the woman was a Greek, a Syrophoenician by descent. She begged him to cast out the demon from her daughter.
\s5
\v 27 He said to her, "Let the children first be fed. For it is not right to take the children's bread and to throw it to the pet dogs."
\v 27 He said to her, "Let the children first be fed. For it is not right to take the children's bread and throw it to the dogs."
\v 28 But she answered and said to him, "Yes, Lord, even the dogs under the table eat the children's crumbs."
\s5
\v 29 He said to her, "Because you have said this, you are free to go. The demon has gone out of your daughter."
\v 30 She went back to her house and found the child lying in the bed, and the demon was gone.
\v 30 She went back to her house and found the child lying on the bed, and the demon was gone.
\s5
\p
\v 31 Again he went out from the region of Tyre and came through Sidon to the Sea of Galilee in the region of the Decapolis.
\v 32 They brought him one who was deaf and had a speech impediment, and they begged Jesus to lay his hand on him.
\v 31 And he went out again from the region of Tyre, went through Sidon to the Sea of Galilee up into the region of the Decapolis.
\v 32 And they brought to him someone who was deaf and had difficulty speaking, and they begged him to lay his hand on him.
\s5
\v 33 He took him aside from the crowd privately, and he put his fingers into his ears, and after spitting, he touched his tongue.
\v 34 He looked up to heaven; he sighed and said to him, "Ephphatha," that is to say, "Open!"
\v 35 Jesus made his ears so they could hear, and at once what had hold of his tongue was released, so he now spoke plainly.
\v 34 He looked up to heaven, he sighed and said to him, "Ephphatha," that is to say, "Open!"
\v 35 And immediately his hearing was opened, and what prevented his tongue was destroyed and he could speak clearly.
\s5
\v 36 He charged them to tell no man. But the more he commanded them to be quiet, the more they talked about it.
\v 37 They were absolutely astonished, saying, "He has done everything well. He even makes the deaf to hear and the mute to speak."
\v 36 And he ordered them to tell no one. But the more he ordered them, the more abundantly they proclaimed it.
\v 37 They were absolutely astonished, saying, "He has done everything well. He even makes the deaf hear and the mute speak."

View File

@ -1,4 +1,3 @@
\s5
\c 2
\p
@ -49,6 +48,3 @@
\v 23 Now when he was in Jerusalem at the Passover, during the feast, many believed in his name, when they saw the miraculous signs that he did.
\v 24 But Jesus would not put his trust in them because he knew all mankind.
\v 25 He did not need anyone to testify to him about what people were like, for he knew what was in them.

View File

@ -16,7 +16,7 @@
\s5
\v 7 Therefore you lack no spiritual gift, as you eagerly wait for the revelation of our Lord Jesus Christ.
\v 8 He will also strengthen you to the end, so that you will be blameless on the day of our Lord Jesus Christ.
\v 9 God is faithful, he who called you into the fellowship of his Son, Jesus Christ our Lord.
\v 9 God is faithful who called you into the fellowship of his Son, Jesus Christ our Lord.
\s5
\p

View File

@ -21,7 +21,7 @@
\v 11 For no one can lay a foundation other than the one which has been laid, that is, Jesus Christ.
\s5
\v 12 Now if anyone builds on the foundation with gold, silver, precious stones, wood, hay, or straw,
\v 13 his work will be revealed, for the daylight will reveal it. For it will be revealed in fire; the fire will test the quality of what each one had done.
\v 13 his work will be revealed, for the daylight will reveal it. For it will be revealed in fire. The fire will test the quality of what each one had done.
\s5
\v 14 If anything a person builds remains, he will receive a reward.
\v 15 But if anyone's work is burned up, he will suffer loss. But he himself will be saved, as though escaping through fire.

View File

@ -3,7 +3,7 @@
\s5
\c 4
\p
\v 1 This is how a person should regard us: We are servants of Christ and stewards of the hidden truths of God.
\v 1 This is how a person should regard us, as servants of Christ and stewards of the hidden truths of God.
\v 2 In this connection, it is a requirement for stewards that they be trustworthy.
\s5

View File

@ -22,8 +22,8 @@
\v 10 In no way did I mean the immoral people of this world, or the greedy, or swindlers, or idolaters, since to stay away from them you would need to go out of the world.
\s5
\v 11 But now I am writing to you not to associate with anyone who is called a brother or sister in Christ but who is living in sexually immorality, or who is greedy, or is an idolater, or is verbally abusive, or is a drunkard, or a swindler. Do not even eat a meal with such a person.
\v 11 But now I am writing to you not to associate with anyone who is called a brother or sister in Christ but who is living in sexual immorality, or who is greedy, or is an idolater, or is verbally abusive, or is a drunkard, or a swindler. Do not even eat a meal with such a person.
\v 12 For how am I involved with judging those who are outside the church? Instead, are you not to judge those who are inside the church?
\v 13 But God judges those who are on the outside:
\v 13 But God judges those who are on the outside.
\q "Remove the evil person from among you."
\m

View File

@ -5,7 +5,7 @@
\p
\v 1 When one of you has a dispute with another, does he dare to go to the civil court before an unbelieving judge, rather than before the believers?
\v 2 Do you not know that the believers will judge the world? And if you will judge the world, are you not able to settle unimportant matters?
\v 3 Do you not know that we will judge the angels? How much more, then, can we not judge matters of this life?
\v 3 Do you not know that we will judge the angels? How much more, then, can we judge matters of this life?
\s5
\v 4 If then you have to make judgments that pertain to daily life, why do you lay such cases as these before those who have no standing in the church?

View File

@ -8,7 +8,7 @@
\s5
\v 3 The husband should give to the wife her conjugal rights, and likewise the wife to her husband.
\v 4 It is not the wife who has authority over her own body; it is the husband. And likewise, the husband does not have authority over his own body, but the wife does.
\v 4 It is not the wife who has authority over her own body, it is the husband. And likewise, the husband does not have authority over his own body, but the wife does.
\s5
\v 5 Do not deprive each other of sleeping together, except by mutual agreement and for a specific period of time. Do this so that you may devote yourselves to prayer. Then you should come together again, so that Satan may not tempt you because of your lack of self-control.
@ -56,13 +56,13 @@
\s5
\v 29 But this I say, brothers and sisters: The time is short. From now on, let those who have wives live as though they had none.
\v 30 Those who weep should act as though they were not weeping. Those who rejoice, as though they were not rejoicing; and those who are buying anything, as though they did not possess anything.
\v 30 Those who weep, should act as though they were not weeping and those who rejoice, as though they were not rejoicing and those who are buying anything, as though they did not possess anything.
\v 31 And those who deal with the world should act as though they had no dealings with it, for the system of this world is coming to an end.
\s5
\v 32 I would like you to be free from worries. The unmarried man is concerned about the things of the Lord, how to please him.
\v 33 But the married man is concerned about the things of the world, how to please his wife.
\v 34 He is divided. The unmarried person or the virgin is concerned about the things of the Lord, how to be set apart in body and in spirit. But the married woman is concerned about the things of the world, how to please her husband.
\v 33 But the married man is concerned about the things of the world, how to please his wife,
\v 34 he is divided. The unmarried woman or the virgin is concerned about the things of the Lord, how to be set apart in body and in spirit. But the married woman is concerned about the things of the world, how to please her husband.
\s5
\v 35 I say this for your own benefit, and not to put any constraint on you. I say this for what is right, so that you may be devoted to the Lord without any distraction.

View File

@ -23,7 +23,7 @@
\s5
\v 11 Now these things happened to them as examples for us. They were written for our instruction—for us on whom the end of the ages has come.
\v 12 Therefore let anyone who thinks he stands be careful that he does not fall.
\v 13 No temptation has overtaken you that is not common to all humanity. Instead, God is faithful: he will not let you be tempted beyond your ability. With the temptation he will also provide the way of escape, so that you may be able to endure it.
\v 13 No temptation has overtaken you that is not common to all humanity. Instead, God is faithful. He will not let you be tempted beyond your ability. With the temptation he will also provide the way of escape, so that you may be able to endure it.
\s5
\p

View File

@ -1,5 +1,3 @@
\s5
\c 7
\nb

View File

@ -13,7 +13,7 @@
\s5
\v 6 So we urged Titus, who had already begun this task, to bring to completion this act of generosity on your part.
\v 7 But you are very productive in everything—in faith, in speech, in knowledge, in all diligence, and in your love for us. So also make sure that you are very productive in this generous deed.
\v 7 But you abound in everything—in faith, in speech, in knowledge, in all diligence, and in your love for us. So also make sure that you abound in this generous deed.
\s5
\v 8 I say this not as a command. Instead, I say this in order to test the sincerity of your love by comparing it to the eagerness of other people.

View File

@ -33,7 +33,7 @@
\v 16 know that no one is justified by the works of the law. Instead, they are justified by faith in Jesus Christ. We came to faith in Christ Jesus so that we might be justified by faith in Christ and not by the works of the law. For by the works of the law no flesh will be justified.
\s5
\v 17 But if, when we seek God to justify us in Christ, we find ourselves also to be sinners, does Christ become a servant of sin? May it not be!
\v 17 But if, when we seek for God to justify us in Christ, we find ourselves also to be sinners, does Christ become a servant of sin? May it not be!
\v 18 For if I rebuild my reliance on keeping the law, a reliance that I had torn down, I show myself to be a law breaker.
\v 19 Through the law I died to the law, so that I might live for God.

View File

@ -6,8 +6,8 @@
\v 2 May grace be to you; may peace increase through the knowledge of God and of Jesus our Lord.
\s5
\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.
\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.
\s5
\v 5 For this same reason, do your best to gain virtue through your faith, and through your virtue, gain knowledge.

View File

@ -6,14 +6,20 @@
\v 3 They will greedily make a profit off of you with deceptive words. Against them condemnation will not wait long; their destruction is not idle.
\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 For 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 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;
\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.

View File

@ -9,9 +9,9 @@
\v 4 and saying, "Where is the promise of his return? Our fathers have died, but all things remain the same since the beginning of creation."
\s5
\v 5 They wilfully forget this, that the heavens and the earth were established out of water and through water, long ago, by the word of God
\v 6 and that through his word and the water the world at that time, being flooded, was destroyed
\v 7 and that the heavens and the earth are reserved by that same word for fire, being reserved for the day of judgment and the destruction of the ungodly people.
\v 5 They willfully forget that the heavens and the earth were established out of water and through water, long ago, by the word of God,
\v 6 and that through his word and the water the world at that time, being flooded, was destroyed.
\v 7 But now the heavens and the earth are reserved by that same word for fire, being reserved for the day of judgment and the destruction of the ungodly people.
\s5
\p