From 49ec328dc12b155d0a773590228a2c30c8bf2118 Mon Sep 17 00:00:00 2001
From: Susan Quigley <susan_quigley@wycliffeassociates.org>
Date: Mon, 29 Jul 2019 20:24:43 +0000
Subject: [PATCH] 132 Conflict Error - Corrected

---
 jit/translate-versebridge/sub-title.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/jit/translate-versebridge/sub-title.md b/jit/translate-versebridge/sub-title.md
index a864ff5..f7b63b8 100644
--- a/jit/translate-versebridge/sub-title.md
+++ b/jit/translate-versebridge/sub-title.md
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-Why are some verse numbers combined, such as "3-5" or "17-18"?
-=======
 Why are some verse numbers combined, such as “3-5” or “17-18”?
 
->>>>>>> Conform file to have EOL at end
+