Fixed 4:39-40 with strange characters

This commit is contained in:
Tom Warren 2016-05-18 12:49:56 -04:00
parent d616354d7b
commit a6841eb1d2
1 changed files with 0 additions and 4 deletions

View File

@ -75,11 +75,7 @@
\s5 \s5
\p \p
<<<<<<< HEAD
\v 39 Many of the Samaritans in that city believed in him because of the report of the woman who was testifying, "He told me everything that I have ever done." \v 39 Many of the Samaritans in that city believed in him because of the report of the woman who was testifying, "He told me everything that I have ever done."
=======
\v 39 Many of the Samaritans in that city believed in him because of the woman's report, she who was testifying, "He told me everything that I have ever done."
>>>>>>> origin/master
\v 40 So when the Samaritans came to him, they implored him to stay with them, and he stayed there two days. \v 40 So when the Samaritans came to him, they implored him to stay with them, and he stayed there two days.
\s5 \s5