From d0bf2d716573e85ec26b1ae2edee03fe5d8f7698 Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Tue, 4 Jun 2019 14:37:43 +0000 Subject: [PATCH] Update '07-JDG.usfm' --- 07-JDG.usfm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/07-JDG.usfm b/07-JDG.usfm index 6086315c..3f63c20e 100644 --- a/07-JDG.usfm +++ b/07-JDG.usfm @@ -81,13 +81,8 @@ \v 30 The men of the tribe of Zebulun did not force the Canaanites who were living in the cities of Kitron and Nahalol to leave. They stayed there and lived with the tribe of Zebulun, but the people of Zebulun forced them to work for them as their slaves. \s5 -<<<<<<< HEAD \v 31 The men of the tribe of Asher did not force the Canaanites who lived in the cities of Akko, Sidon, Ahlab, Aczib, Helbah, Aphek, and Rehob to leave. \v 32 So the tribe of Asher lived with the Canaanites (those who were still there) and did not make them leave. -======= -\v 31 The men of the tribe of Asher did not force the Canaanites who lived in Akko, Sidon, Ahlab, Akzib, Helbah, Aphek and Rehob cities to leave. -\v 32 So the tribe of Asher lived with the Canaanites (those who were still there), and did not make them leave. ->>>>>>> UDB align with ULB spelling \s5 \v 33 The men of the tribe of Naphtali did not compel the people who lived in the cities of Beth Shemesh and Beth Anath to leave, so they continued to live with the Canaanites in those cities, but the Canaanites were forced to work as the slaves of Naphtali. @@ -1020,13 +1015,8 @@ \s5 \v 3 One day, the angel of Yahweh appeared to Manoah's wife and said to her, "Even though you have not been able to give birth to any children until now, you will soon become pregnant and you will give birth to a son. -<<<<<<< Updated upstream -\v 4 From now until he is born, you must not drink any wine or other alcoholic drink, and you must not eat any food that the law says you should not eat. -\v 5 You will become pregnant. After you give birth to your son, no one may ever cut his hair. He will be dedicated to God even before he is born until the day he dies. He will begin the work that will rescue Israel from the power of the Philistines." -======= \v 4 From now until he is born, you must not drink any wine or other alcoholic drink, and you must not eat any food that the law says we should not eat. \v 5 You will become pregnant. After you give birth to your son, no one may ever cut his hair. He will be dedicated to God even before he is born. He will begin the work that will rescue Israel from the power of the Philistines.” ->>>>>>> Stashed changes \s5 \p