From a6841eb1d277997e4c172a31d6b13f0d1981e3bd Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Wed, 18 May 2016 12:49:56 -0400 Subject: [PATCH] Fixed 4:39-40 with strange characters --- 44-JHN/04.usfm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/44-JHN/04.usfm b/44-JHN/04.usfm index 38c1cbb7..3db2b247 100644 --- a/44-JHN/04.usfm +++ b/44-JHN/04.usfm @@ -75,11 +75,7 @@ \s5 \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 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. \s5