From e7763e2a199f4e9c5e7c455a8e3f62a0c7a8e417 Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Tue, 24 May 2016 10:45:07 -0400 Subject: [PATCH] Fixed conflicts --- 65-3JN/01.usfm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/65-3JN/01.usfm b/65-3JN/01.usfm index c537d28e..0def0ed6 100644 --- a/65-3JN/01.usfm +++ b/65-3JN/01.usfm @@ -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! \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. ->>>>>>> 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. \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. @@ -28,13 +21,8 @@ \s5 \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, but those who do what is evil do not know God. ->>>>>>> origin/master \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.