From 308866fa82fac4bd8031d2d5b75c2e7079b92cf3 Mon Sep 17 00:00:00 2001
From: Tom Warren <tom_warren@wycliffeassociates.org>
Date: Fri, 16 Sep 2016 15:09:48 -0400
Subject: [PATCH] Check

---
 19-PSA/096.usfm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/19-PSA/096.usfm b/19-PSA/096.usfm
index 1e173a69..aec08ff3 100644
--- 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.