Check

2016-09-16 15:09:48 -04:00 · 2016-09-16 15:09:48 -04:00 · 308866fa82
parent d18a5afbca
commit 308866fa82
1 changed files with 0 additions and 4 deletions
--- a/19-PSA/096.usfm
+++ b/19-PSA/096.usfm
@ -29,11 +29,7 @@
 \s5
 \q
 \v 7 Give praise to Yahweh, you clans of peoples,
-<<<<<<< HEAD
-\q give praise to Yahweh glory and strength.
-=======
 \q give praise to Yahweh for his glory and strength.
->>>>>>> origin/master
 \q
 \v 8 Give to Yahweh the glory that his name deserves.
 \q Bring an offering and come into his courts.