6 lines
446 B
Plaintext
6 lines
446 B
Plaintext
<<<<<<< HEAD
|
|
\v 7 Salomon was the father of Roboam, Roboam the father of Abias, Abias the father of Asa, \v 8 Asa the father of Josafat, Josafat was the father of Joram and Joram the father of Uzias.
|
|
=======
|
|
\v 7 Salomön was the father of Roboam, Roboam the father of Abias, Abias the father of Asa, \v 8 Asa the father of Josafat, Josafat was the father of Joram, and Joram the father of Uzias.
|
|
>>>>>>> 384dc588333f4fff662b139b84739e40f5e465d4
|