Errors in text resolution.

This commit is contained in:
Tom Warren 2016-12-07 08:51:25 -05:00
parent 0f734a2f18
commit 924a5811d6
2 changed files with 1 additions and 9 deletions

View File

@ -48,7 +48,7 @@
\v 23 On the eighth day he must bring them for his cleansing to the priest, to the entrance to the tent of meeting, before Yahweh. \v 23 On the eighth day he must bring them for his cleansing to the priest, to the entrance to the tent of meeting, before Yahweh.
\s5 \s5
\v 24 Then the priest will take the lamb for the guilt offering and the log of oil, and he will wave them for a wave offering before Yahweh. \v 24 The priest will take the lamb for an offering, and he will take with it the log of olive oil, and he will lift them high as he presents them to Yahweh.
\v 25 He will kill the lamb for the guilt offering, and he will take some of the blood of the guilt offering and put it on the tip of the right ear of the one who is to be cleansed, on the thumb of his right hand, and on the big toe of his right foot. \v 25 He will kill the lamb for the guilt offering, and he will take some of the blood of the guilt offering and put it on the tip of the right ear of the one who is to be cleansed, on the thumb of his right hand, and on the big toe of his right foot.
\s5 \s5

View File

@ -9,11 +9,7 @@
\s5 \s5
\p \p
\v 3 When the inhabitants of Gibeon heard what Joshua had done to Jericho and to Ai, \v 3 When the inhabitants of Gibeon heard what Joshua had done to Jericho and to Ai,
<<<<<<< HEAD
\v 4 they acted with a cunning plan. They went as messengers. They took worn-out sacks and put them on their donkeys. They also took old wineskins that were worn, torn, and had been repaired. \v 4 they acted with a cunning plan. They went as messengers. They took worn-out sacks and put them on their donkeys. They also took old wineskins that were worn, torn, and had been repaired.
=======
\v 4 they acted with a cunning plan. They went as messengers. They took worn-out sacks and put them on their donkeys. They also took old wine skins that were worn, torn, and had been repaired.
>>>>>>> origin/master
\f + \ft Instead of \fqa They went as messengers, \fqb some versions have, \fqa They got provisions ready. \fqb \f* \f + \ft Instead of \fqa They went as messengers, \fqb some versions have, \fqa They got provisions ready. \fqb \f*
\v 5 They put old and patched sandals on their feet, and dressed in old, worn-out clothing. All the bread in their food supply was dry and moldy. \v 5 They put old and patched sandals on their feet, and dressed in old, worn-out clothing. All the bread in their food supply was dry and moldy.
\s5 \s5
@ -28,12 +24,8 @@
\s5 \s5
\v 11 Our elders and all the inhabitants of our country said to us, 'Take provisions in your hand for the journey. Go to meet them and say to them, "We are your servants. Make a treaty with us." \v 11 Our elders and all the inhabitants of our country said to us, 'Take provisions in your hand for the journey. Go to meet them and say to them, "We are your servants. Make a treaty with us."
\v 12 This is our bread, it was still warm when we took it from our houses on the day we set out to come to you. But now, see, it is dry and moldy. \v 12 This is our bread, it was still warm when we took it from our houses on the day we set out to come to you. But now, see, it is dry and moldy.
<<<<<<< HEAD
\v 13 These wineskins were new when we filled them, and look, now they are leaking. Our garments and our sandals are worn-out from a very long journey.'" \v 13 These wineskins were new when we filled them, and look, now they are leaking. Our garments and our sandals are worn-out from a very long journey.'"
=======
\v 13 These wineskins were new when we filled them, and look, now they are leaking. Our garments and our sandals are worn out from a very long journey.'"
>>>>>>> origin/master
\s5 \s5
\v 14 So the Israelites took some of their provisions, but they did not consult with Yahweh for guidance. \v 14 So the Israelites took some of their provisions, but they did not consult with Yahweh for guidance.
\v 15 Joshua made peace with them and made a covenant with them, to let them live. The leaders of the people also made a vow to them. \v 15 Joshua made peace with them and made a covenant with them, to let them live. The leaders of the people also made a vow to them.