This commit is contained in:
Tom Warren 2016-09-13 13:21:59 -04:00
parent 0b4e14dd98
commit a92e7575f5
1 changed files with 1 additions and 5 deletions

View File

@ -29,13 +29,9 @@
\s5 \s5
\q \q
\v 7 Be still before Yahweh and wait patiently for him. \v 7 Be still before Yahweh and wait patiently for him.
<<<<<<< HEAD
\q Do not be angry if someone succeeds in what he does, \q Do not be angry if someone succeeds in what he does,
\q when he makes evil plots. \q when he makes evil plots.
=======
\q Do not be distressed about the one who succeeds in what he does,
\q or when he carries out his evil plans.
>>>>>>> origin/master
\s5 \s5
\q \q