WycliffeAssociates
/
en_ulb
6
0
Fork 8
Files Issues 124 Pull Requests Releases 2 Wiki Activity See in Reader

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	01-GEN/32.usfm
This commit is contained in:
Tom Warren 2016-08-08 15:25:19 -04:00
parent c99d3798b7 293723b0cd
commit 953a3fe61d
661 changed files with 1700 additions and 1705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
01-GEN/14.usfm
View File

@ -1,5 +1,4 @@
\s5 \s5
\c 14 \c 14
\p \p
@ -50,6 +49,3 @@ Then Abram gave him a tenth of everything.
\v 22 Abram said to the king of Sodom, "I have lifted up my hand to Yahweh, God Most High, Creator of heaven and earth, \v 22 Abram said to the king of Sodom, "I have lifted up my hand to Yahweh, God Most High, Creator of heaven and earth,
\v 23 that I will not take a thread, a sandal strap, nor anything that is yours, so that you can never say, 'I have made Abram rich.' \v 23 that I will not take a thread, a sandal strap, nor anything that is yours, so that you can never say, 'I have made Abram rich.'
\v 24 I will take nothing except what the young men have eaten and the share of the men that went with me. Let Aner, Eshcol, and Mamre take their portion." \v 24 I will take nothing except what the young men have eaten and the share of the men that went with me. Let Aner, Eshcol, and Mamre take their portion."

4
01-GEN/32.usfm
View File

@ -38,7 +38,11 @@
\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

2
05-DEU/01.usfm
View File

@ -94,5 +94,3 @@
\v 46 So you stayed in Kadesh many days, all the days that you stayed there. \v 46 So you stayed in Kadesh many days, all the days that you stayed there.

5
07-JDG/20.usfm
View File

@ -7,7 +7,7 @@
\v 2 The leaders of all the people, of all the tribes of Israel, took their places in the assembly of the people of God—400,000 men on foot, who were ready to fight with the sword. \v 2 The leaders of all the people, of all the tribes of Israel, took their places in the assembly of the people of God—400,000 men on foot, who were ready to fight with the sword.
\s5 \s5
\v 3 Now the people of Benjamin heard that the people of Israel had gone up to Mizpah. The people of Israel said, "Tell us how this wicked thing happened?" \v 3 Now the people of Benjamin heard that the people of Israel had gone up to Mizpah. The people of Israel said, "Tell us how this wicked thing happened."
\v 4 The Levite, the husband of the woman who had been murdered, answered, "I came to Gibeah in the territory that belongs to Benjamin, I and my concubine, to spend the night. \v 4 The Levite, the husband of the woman who had been murdered, answered, "I came to Gibeah in the territory that belongs to Benjamin, I and my concubine, to spend the night.
\s5 \s5
@ -104,6 +104,3 @@
\s5 \s5
\v 47 But six hundred men turned and fled to the wilderness, toward the rock of Rimmon. And they stayed at the rock of Rimmon for four months. \v 47 But six hundred men turned and fled to the wilderness, toward the rock of Rimmon. And they stayed at the rock of Rimmon for four months.
\v 48 The soldiers of Israel turned back against the people of Benjamin and attacked and killed them—the entire city, the cattle, and everything that they found. They also burned down every town in their path. \v 48 The soldiers of Israel turned back against the people of Benjamin and attacked and killed them—the entire city, the cattle, and everything that they found. They also burned down every town in their path.