RPP
/
en_udb
9
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Fixed conflicts

This commit is contained in:
Tom Warren 2016-05-24 10:45:07 -04:00
parent 99dc180135
commit e7763e2a19
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
65-3JN/01.usfm
View File

@ -8,14 +8,7 @@
\v 4 I am very happy when I hear that people whom I helped to believe in Christ are living in a way that matches God's truth! \v 4 I am very happy when I hear that people whom I helped to believe in Christ are living in a way that matches God's truth!
\s5 \s5
<<<<<<< HEAD
\v 5 Dear friend, you are serving Jesus loyally whenever you do things to help fellow believers, helping strangers whom you do not know, who are traveling around doing God's work.
=======
\v 5 Dear friend, you are serving Jesus loyally whenever you do things to help fellow believers, even strangers whom you do not know, who are traveling around doing God's work. \v 5 Dear friend, you are serving Jesus loyally whenever you do things to help fellow believers, even strangers whom you do not know, who are traveling around doing God's work.
>>>>>>> origin/master
\v 6 Some of them have reported before the congregation here how you have showed that you love them. You should continue to help such people do their work in a way that honors God. \v 6 Some of them have reported before the congregation here how you have showed that you love them. You should continue to help such people do their work in a way that honors God.
\p \p
\v 7 When those fellow believers went out to tell people about Jesus, they received no money from people who do not believe in Christ. \v 7 When those fellow believers went out to tell people about Jesus, they received no money from people who do not believe in Christ.
@ -28,13 +21,8 @@
\s5 \s5
\p \p
<<<<<<< HEAD
\v 11 Dear friend, do not imitate a bad example like that. Instead, keep imitating good examples. Remember that people who do good deeds truly belong to God. Any one who keeps doing what is bad has never seen God. \v 11 Dear friend, do not imitate a bad example like that. Instead, keep imitating good examples. Remember that people who do good deeds truly belong to God. Any one who keeps doing what is bad has never seen God.
=======
\v 11 Dear friend, do not imitate a bad example like that. Instead, keep imitating good examples. Remember that people who do good deeds truly belong to God, but those who do what is evil do not know God.
>>>>>>> origin/master
\p \p
\v 12 All the believers who know Demetrius say that he is a good person. If the truth were a person, he would say the same thing! We also say he is a good person, and you know that what we say about him is true. \v 12 All the believers who know Demetrius say that he is a good person. If the truth were a person, he would say the same thing! We also say he is a good person, and you know that what we say about him is true.