From 3a083681b4066b03aaf9c2e6e87a40133a3fb633 Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Mon, 8 Aug 2016 15:26:21 -0400 Subject: [PATCH] Fix conflict --- 01-GEN/32.usfm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/01-GEN/32.usfm b/01-GEN/32.usfm index 6f8cd203..3fbd354c 100644 --- a/01-GEN/32.usfm +++ b/01-GEN/32.usfm @@ -38,11 +38,7 @@ \s5 \v 19 Jacob also gave instructions to the second group, the third, and all the men who followed the herds. He said, "You will say the same thing to Esau when you meet him. -<<<<<<< HEAD \v 20 You also will say, 'Your servant Jacob is coming after us.'" For he thought, "I will appease him with the gifts that I am sending ahead of me. Then later, when I will see him, perhaps he will receive me." -======= -\v 20 You will say also, 'Your servant Jacob is coming after us.'" For he thought, "I will appease him with the gifts that go ahead of me. When I meet him afterwards, perhaps he will accept me." ->>>>>>> origin/master \v 21 So the gifts went on ahead of him. He himself stayed that night in the camp. \s5