From 904112ef76fed532a3f7bbf31981a669216b2d0d Mon Sep 17 00:00:00 2001
From: TomWarren <Tom_Warren@wycliffeassociates.org>
Date: Thu, 29 Nov 2018 10:53:57 -0500
Subject: [PATCH] Fix PSA 26:11  from Bob

---
 19-PSA.usfm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/19-PSA.usfm b/19-PSA.usfm
index a30069e7..341dd51c 100644
--- a/19-PSA.usfm
+++ b/19-PSA.usfm
@@ -1545,13 +1545,8 @@
 
 \s5
 \q1
-<<<<<<< HEAD
-\v 11 But as for me, I always try to do what is right;
-\q2 act kindly toward me and rescue me.
-=======
 \v 11 But as for me, I always do what is right.
 \q2 So act kindly toward me and rescue me.
->>>>>>> Fixes from Bob Johnson.
 \q1
 \v 12 I stand in places where I am safe,
 \q2 and when all your people gather together, I praise you.