dan
/
en_ulb
1
0
Fork 1
Files Issues Pull Requests Releases Wiki Activity See in Reader

Fix conflict

This commit is contained in:
Tom Warren 2016-08-08 15:26:21 -04:00
parent 953a3fe61d
commit 3a083681b4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
01-GEN/32.usfm
View File

@ -38,11 +38,7 @@
\s5 \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. \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 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. \v 21 So the gifts went on ahead of him. He himself stayed that night in the camp.
\s5 \s5