From 8bbfde512b3b650bbf951bcbae6277e08e9e0f8e Mon Sep 17 00:00:00 2001 From: TomWarren Date: Mon, 4 Nov 2019 13:06:47 -0500 Subject: [PATCH] Fixed staged --- 16-NEH.usfm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/16-NEH.usfm b/16-NEH.usfm index 03964567..0cf542a1 100644 --- a/16-NEH.usfm +++ b/16-NEH.usfm @@ -467,11 +467,7 @@ \q \v 58 Jaala, Darkon, Giddel, \q -<<<<<<< Updated upstream -\v 59 the descendants of Shephatiah, the descendants of Hattil, the descendants of Pokereth-Hazzebaim, and the descendants of Amon. -======= \v 59 the descendants of Shephatiah, the descendants of Hattil, the descendants of Pokereth-Hazzebaim, the descendants of Amon. ->>>>>>> Stashed changes \p \v 60 Altogether, there were 392 temple workers and descendants of Solomon's servants who returned. @@ -775,13 +771,15 @@ These are from the relatives of Judah: Athaiah the son of Uzziah, who was the so \s5 \m +<<<<<<< HEAD <<<<<<< Updated upstream \v 10 The priests who settled in Jerusalem were Jedaiah the son of Joiarib, Jakin, and \v 11 Seraiah the son of Hilkiah, who was the son of Meshullam, who was the son of Zadok, who was the son of Meraioth, who was the son of Ahitub, who was previously the leader of all the priests. ======= +======= +>>>>>>> Fixed staged \v 10 The priests who settled in Jerusalem were Jedaiah son of Joiarib, Jakin, and \v 11 Seraiah the son of Hilkiah, the son of Meshullam, the son of Zadok, the son of Meraioth, the son of Ahitub, who was previously the leader of all the priests. ->>>>>>> Stashed changes \v 12 Altogether, 822 members of that clan worked in the temple. \p Another priest who settled in Jerusalem was Adaiah the son of Jeroham, who was the son of Pelaliah, who was the son of Amzi, who was the son of Zechariah, who was the son of Pashhur, who was the son of Malkijah.