Merge remote-tracking branch 'origin/master'

# Conflicts:
#	62-2PE/01.usfm
This commit is contained in:
Tom Warren 2016-06-02 15:43:55 -04:00
commit 3b42c28d4d
7 changed files with 37 additions and 37 deletions

View File

@ -88,19 +88,19 @@
\v 47 Evening came, and the boat was now in the middle of the sea, and he was alone on land.
\s5
\v 48 He saw that they were straining at the oars, for the wind was against them. About the fourth watch of the night he came to them, walking on the lake, and he wanted to pass by them,
\v 49 but when they saw him walking on the lake, they thought he was a ghost and they cried out,
\v 50 for they all saw him and were terrified. But immediately he spoke to them and said, "Be brave! It is I! Be not afraid."
\v 48 And he saw that they were stressed while they rowed because the wind was against them. Around the fourth watch of the night he came to them, walking on the sea, and he wanted to pass by them.
\v 49 But when they saw him walking on the sea, they thought he was a ghost and cried out,
\v 50 because they saw him and were terrified. And immediately he spoke to them and said to them, "Be courageous! It is I! Do not be afraid!"
\s5
\v 51 He got into the boat with them, and the wind ceased blowing; and they were completely amazed at him.
\v 52 For they did not understood about the loaves, but their minds were slow to understand.
\v 51 He got into the boat with them, and the wind ceased blowing, and they were completely amazed at him.
\v 52 For they had not understood what the loaves meant, but their minds were slow to understand.
\s5
\p
\v 53 When they had crossed over, they came to land at Gennesaret and anchored the boat.
\v 54 When they came out of the boat, people immediately recognized it was Jesus.
\v 55 The people ran through the whole region and began to bring the sick on stretchers to him, wherever they heard he was coming.
\v 54 When they came out of the boat, they immediately recognized him.
\v 55 And they ran through the whole region and began to bring the sick to him on matrasses, wherever they heard he was coming.
\s5
\v 56 Wherever he entered into villages, or cities, or into the country, they would put the sick in the marketplaces, and they begged him that they might just touch the fringe of his garment, and as many as touched it were healed.
\v 56 Wherever he entered into villages, or cities, or into the country, they would put the sick in the marketplaces, and they begged him to just let them tough the fringe of his garment. And as many as touched him were healed.

View File

@ -1,22 +1,20 @@
\s5
\c 7
\p
\v 1 The Pharisees gathered together with Jesus, with some of the scribes who had come from Jerusalem.
\v 1 The Pharisees and some of the scribes who had come from Jerusalem gathered around him.
\s5
\v 2 They saw that some of his disciples ate their bread with defiled, that is, with unwashed, hands.
\v 3 (For the Pharisees and all the Jews, do not eat unless they wash their hands thoroughly; they hold to the tradition of the elders.
\v 2 And they saw that some of his disciples ate bread with defiled hands; that is unwashed.
\v 3 (For the Pharisees and all the Jews do not eat unless they wash their hands thoroughly; they hold to the tradition of the elders.
\v 4 When the Pharisees come from the marketplace, they do not eat unless they bathe themselves. And there are many other rules which they strictly follow, including the washing of cups, pots, copper vessels, and even the dining couches.)
\s5
\v 5 The Pharisees and the scribes asked Jesus, "Why do your disciples not live according to the tradition of the elders, for they eat their bread with unwashed hands?
\v 5 The Pharisees and the scribes asked Jesus, "Why do your disciples not live according to the tradition of the elders, for they eat their bread with unwashed hands?"
\s5
\v 6 He said, "Isaiah prophesied well about you hypocrites, he wrote,
\v 6 But he said to them, "Isaiah prophesied well about you hypocrites, he wrote,
\q 'This people honors me with their lips,
\q but their heart is far from me.'
\q but their heart is far from me.
\q
\v 7 Empty worship they offer me,
\q teaching the rules of men as their doctrines.'
@ -24,7 +22,7 @@
\s5
\v 8 You abandon the commandment of God and hold fast to the tradition of men."
\v 9 He said, "You conveniently reject the commandment of God so you may keep your tradition!
\v 9 And he said to them, "You conveniently reject the commandment of God so you may keep your tradition!
\v 10 For Moses said, 'Honor your father and your mother,' and, 'He who speaks evil of his father or mother, will surely die.'
\s5
@ -50,9 +48,9 @@
\s5
\p
\v 24 He got up from there and went away to the region of Tyre and Sidon. He entered into a house and he did not want anyone to know he was there. But he could not be hidden.
\v 25 But just then a woman came, whose little daughter had an unclean spirit. This woman heard about Jesus and came and fell down at his feet.
\v 26 Now the woman was a Greek, a Syrophoenician by race. She begged him to cast out the demon from her daughter.
\v 24 He got up from there and went away to the region of Tyre and Sidon. He came into a house and he did not want anyone to know he was there, yet he could not be hidden.
\v 25 But immediately a woman, whose little daughter had an unclean spirit, heard about him, came, and fell down at his feet.
\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."
@ -75,5 +73,3 @@
\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."

View File

@ -20,7 +20,7 @@
\v 11 But if I do not know the meaning of a language, I will be a foreigner to the speaker, and the speaker will be a foreigner to me.
\s5
\v 12 Likewise with you: since you are eager for the manifestations of the Spirit, be zealous to excel in building up the church.
\v 12 Likewise with you: since you are eager for the manifestations of the Spirit, be zealous to abound in building up the church.
\v 13 So the one who speaks in a tongue should pray that he may interpret.
\v 14 For if I pray in a tongue, my spirit prays, but my mind is unfruitful.

View File

@ -31,7 +31,7 @@
\v 7 For in his beloved one, we have redemption through his blood, the forgiveness of sins. We have this because of the riches of his grace.
\v 8 This grace was abundantly provided for us in all wisdom and understanding.
\v 8 He made this grace abound for us in all wisdom and understanding.
\s5
\v 9 God made known to us the hidden truth of the plan, according to his desire that he demonstrated in Christ.

View File

@ -48,7 +48,7 @@
\v 24 Yet to remain in the flesh is more necessary for your sake.
\s5
\v 25 Since I am confident about this, I know that I will remain and continue with you all, for your progress and joy in the faith.
\v 26 As a result, your glorying in Christ Jesus because of me will multiply because of my presence again with you.
\v 26 As a result, your glorying in Christ Jesus because of me will abound because of my presence again with you.
\v 27 Only conduct your lives in a manner worthy of the gospel of Christ. Do this so that, whether I come to see you or I am absent, I may hear about how you are standing firmly in one spirit. I wish to hear that you are with one soul striving together for the faith of the gospel.
\s5
\v 28 And do not be frightened by anything done by your enemies. This is for them a sign of their destruction. But for you it is a sign of your salvation, and this from God.

View File

@ -1,17 +1,17 @@
\s5
\c 1
\p
\v 1 Paul, an apostle of Christ Jesus according to the commandment of God our Savior and Christ Jesus our confidence
\v 2 to Timothy, a true son in the faith: Grace, mercy, and peace from God the Father and Christ Jesus our Lord.
\v 1 Paul, an apostle of Christ Jesus according to the commandment of God our Savior and Christ Jesus our confidence,
\v 2 to Timothy, a true son in the faith: Grace, mercy, and peace from God the Father and Christ Jesus our Lord.
\b
\s5
\p
\v 3 As I urged you to do when I was leaving for Macedonia, remain in Ephesus so that you can command certain people not to teach a different doctrine.
\v 4 Neither should they pay attention to stories and endless genealogies, which cause arguments rather than helping the plan of God, which is by faith.
\v 4 Neither should they pay attention to stories and endless genealogies. These cause arguments rather than helping the plan of God, which is by faith.
\s5
\v 5 But the goal of the commandment is love from a pure heart, from a good conscience, and from a sincere faith.
\v 5 Now the goal of the commandment is love from a pure heart, from a good conscience, and from a sincere faith.
\v 6 Some people have missed the mark and have turned away from these things to foolish talk.
\v 7 They want to be teachers of the law, but they do not understand what they say or what they insist on.
\v 8 But we know that the law is good if one uses it lawfully.
@ -23,14 +23,14 @@
\s5
\p
\v 12 I thank Christ Jesus our Lord, who strengthened me, for he considered me faithful and placed me into service.
\v 12 I thank Christ Jesus our Lord. He strengthened me, for he considered me faithful, and he placed me into service.
\v 13 I am a former blasphemer, persecutor and a violent man. But I received mercy because I acted ignorantly in unbelief.
\v 13 I was a blasphemer, a persecutor, and a violent man. But I received mercy because I acted ignorantly in unbelief.
\v 14 But the grace of our Lord overflowed with faith and love that is in Christ Jesus.
\s5
\v 15 This message is reliable and worthy of all acceptance, that Christ Jesus came into the world to save sinners. I am the worst of these.
\v 16 But for this reason I was given mercy, so that in me, the foremost, Christ Jesus might demonstrate all patience. This would be an example for those who would trust in him for eternal life.
\v 16 But for this reason I was given mercy, so that in me, the foremost, Christ Jesus might demonstrate all patience. He did this as an example for those who would trust in him for eternal life.
\v 17 Now to the king of the ages, the immortal, invisible, the only God, be honor and glory forever and ever. Amen.
\s5

View File

@ -6,13 +6,17 @@
\v 2 May grace be to you; may peace increase through the knowledge of God and of Jesus our Lord.
\s5
<<<<<<< HEAD
\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 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. Through your endurance, gain godliness.
\v 7 And through your godliness, gain brotherly affection. And by your brotherly affection, gain love.
\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 7 Through your godliness, gain brotherly affection, and by your brotherly affection, gain love.
\s5
\v 8 If these things are in you and grow in you, you will not be barren or unfruitful in the knowledge of our Lord Jesus Christ.
@ -24,14 +28,14 @@
\s5
\p
\v 12 Therefore I will be ready always to remind you of these things, although you know them, and you are strong in the truth now.
\v 12 Therefore I will be ready always to remind you of these things, although you know them, and you are strong in the truth now.
\v 13 I think it is right for me to wake you up and to remind you about these things, as long as I am in this tent.
\v 14 For I know that soon I will remove my tent, as our Lord Jesus Christ has shown me.
\v 15 I will do my best for you to always remember these things after my departure.
\s5
\v 16 For we did not follow cleverly invented myths when we told you about the power and the appearance of our Lord Jesus Christ, but we were eyewitnesses of his majesty.
\v 17 For he received from God the Father honor and glory when a voice was borne to him from the Majestic Glory saying, "This is my Son, the beloved One, with whom I am well pleased."
\v 17 He received from God the Father honor and glory when a voice was borne to him from the Majestic Glory saying, "This is my Son, the beloved One, with whom I am well pleased."
\v 18 We heard this voice that came out of heaven, while we were with him on the holy mountain.
\s5