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

fix and sync

This commit is contained in:
Tom Warren 2016-09-30 12:28:09 -04:00
parent 81ae983bbb
commit 785f4ef5ae
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
31-OBA/01.usfm
View File

@ -46,12 +46,8 @@ their disaster, do not loot their wealth in the day of their ruin.
\v 18 The house of Jacob will be a fire, and the house of Joseph a flame, and the house of Esau will be stubble, and they will burn them, and consume them. There will be no survivors to the house of Esau, for Yahweh has spoken it." \v 18 The house of Jacob will be a fire, and the house of Joseph a flame, and the house of Esau will be stubble, and they will burn them, and consume them. There will be no survivors to the house of Esau, for Yahweh has spoken it."
\s5 \s5
<<<<<<< HEAD
\v 19 And those from the Negev will possess the mount of Esau, and those of the Shephelah will possess the land of the Philistines; and they will possess the land of Ephraim, and the land of Samaria; and Benjamin will
possess Gilead.
=======
\v 19 And those from the Negev will possess the mount of Esau and those of the Shepelah will possess the land of the Philistines. They will possess the land of Ephraim and the land of Samaria; and Benjamin will possess Gilead. \v 19 And those from the Negev will possess the mount of Esau and those of the Shepelah will possess the land of the Philistines. They will possess the land of Ephraim and the land of Samaria; and Benjamin will possess Gilead.
>>>>>>> origin/master
\s5 \s5
\v 20 The exiles of this host of the people of Israel will possess the land of Canaan as far as Zarephath. The exiles of Jerusalem, who are in Sepharad, will possess the cities of the Negev. \v 20 The exiles of this host of the people of Israel will possess the land of Canaan as far as Zarephath. The exiles of Jerusalem, who are in Sepharad, will possess the cities of the Negev.