From a92e7575f5d9b9b8c7d1f6df6e475db9005636e3 Mon Sep 17 00:00:00 2001
From: Tom Warren <tom_warren@wycliffeassociates.org>
Date: Tue, 13 Sep 2016 13:21:59 -0400
Subject: [PATCH] Fix

---
 19-PSA/037.usfm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/19-PSA/037.usfm b/19-PSA/037.usfm
index eb591eca..1d66c0b8 100644
--- a/19-PSA/037.usfm
+++ b/19-PSA/037.usfm
@@ -29,13 +29,9 @@
 \s5
 \q
 \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 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
 \q