jdwood
/
en_ulb
forked from WycliffeAssociates/en_ulb
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Resolve conflicts in Ezra

This commit is contained in:
Phil Hopper 2016-06-14 08:42:52 -04:00
parent bd5ba17117
commit 5399ac8dd3
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
15-EZR/06.usfm
View File

@ -18,11 +18,7 @@
\s5
\v 8 I am ordering that you must do this for these Jewish elders who build this house of God: Funds from the king's tribute beyond the River will be used to pay these men so they do not have to stop their work.
<<<<<<< HEAD
\v 9 Whatever is needed—young bulls, rams, or lambs for the burnt offerings to the God of Heaven, grain, salt, wine, or oil according to the command of the priests in Jerusalem—give these things to them every day without fail.
=======
\v 9 Whatever is needed—young bulls, rams, or lambs for the burnt offerings to the God of Heaven, grain, salt, wine, or oil according to the command of the priests in Jerusalem—give these things to them every day without fail.
>>>>>>> origin/master
\v 10 Do this so they will bring the offering in to the God of Heaven and pray for me, the king, and my sons.
\s5

11
15-EZR/09.usfm
View File

@ -24,11 +24,7 @@
\s5
\v 10 But now, our God, what can we say after this? We have forgotten your commands,
<<<<<<< HEAD
\v 11 the commands that you gave to your servants the prophets, when you said, "This land that you are entering to possess is an unclean land. It is contaminated by the people of the lands with their abominations. They have filled it from one end to the other with their uncleanness.
=======
\v 11 the commands that you gave to your servants the prophets, when you said, "This land that you are entering to possess is an unclean land. It is contaminated by the people of the lands with their abominations. They have filled from one end to the other with their uncleanness.
>>>>>>> origin/master
\v 12 So now, do not give your daughters to their sons; do not take their daughters for your sons, and do not seek their ongoing peace and welfare, so that you will be strong and eat the good of the land, so you will cause your children to possess it for all time."
\s5
@ -36,12 +32,5 @@
\v 14 should we again break your commandments and make mixed marriages with these abominable people? Will you not be angry and annihilate us so there will be no one left, no one to escape?
\s5
<<<<<<< HEAD
\v 15 Yahweh, God of Israel, you are righteous, for we have remained as a few survivors at this day. Look! We are here before you in our guilt, for there is no one who can stand before you because of this.'"
=======
\v 15 Yahweh, God of Israel, you are righteous, for we have remained as a few survivors at this day. Look! We are here before you in our guilt, for there is no one who can stand before you because
of this.'"
>>>>>>> origin/master