From b3d38d067ec9c3574fae10d0132308ff8d14d0c4 Mon Sep 17 00:00:00 2001 From: Tom Warren Date: Fri, 12 Aug 2016 08:53:49 -0400 Subject: [PATCH] Sync conflict resolved --- 02-EXO/36.usfm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/02-EXO/36.usfm b/02-EXO/36.usfm index d068dc38..2486f115 100644 --- a/02-EXO/36.usfm +++ b/02-EXO/36.usfm @@ -12,11 +12,7 @@ \v 4 As a result, the men who were doing various things to make the sacred tent came to Moses, each of them what Yahweh commanded them. \s5 -<<<<<<< HEAD \v 5 So the craftsmen said to Moses, "The people are bringing more than we need to do the work that Yahweh has commanded us!" -======= -\v 5 And the craftsmen said to Moses, "The people are bringing more than we need to do the work that Yahweh has commanded us!" ->>>>>>> origin/master \v 6 So Moses gave them a message that others proclaimed throughout the camp, saying "No one should bring anything more as an offering to make the sacred tent!" When the people heard that, they did not bring anything more. \v 7 What they had already brought was enough to do all the work. In fact, it was more than was needed!