synced and ok
This commit is contained in:
parent
cd8d2c9770
commit
292cd3780f
|
@ -36,11 +36,7 @@
|
|||
\v 14 In those times many will rise against the king of the South. Sons of the violent among your people will set themselves in order to fulfill a vision, but they will stumble.
|
||||
|
||||
\s5
|
||||
<<<<<<< HEAD
|
||||
\v 15 The king of the North will come, pour out earth for siege mounds, and capture city with fortifications. The forces of the South will not be able to stand, not even their best soldiers. There will be no strength to stand.
|
||||
=======
|
||||
\v 15 The king of the North will come, pour out earth for siege mounds, and capture a city with fortifications. The forces of the South will not be able to stand, not even their best soldiers. There will be no strength to stand.
|
||||
>>>>>>> origin/master
|
||||
\v 16 Instead, the one who comes will act according to his desires against him; no one will stand in his way. He will stand in the land of beauty, and destruction will be in his hand.
|
||||
|
||||
\s5
|
||||
|
|
Loading…
Reference in New Issue