From 337ffa802b31e4f2ec27046bb585bf0120dd58fc Mon Sep 17 00:00:00 2001
From: Henry Whitney <henry_whitney@wycliffeassociates.org>
Date: Mon, 8 Jul 2019 14:59:10 -0400
Subject: [PATCH] Resolve conflict

---
 jit/figs-metaphorparts/title.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/jit/figs-metaphorparts/title.md b/jit/figs-metaphorparts/title.md
index 1e5f557..6fa16a5 100644
--- a/jit/figs-metaphorparts/title.md
+++ b/jit/figs-metaphorparts/title.md
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 Parts of a Metaphor
-=======
-Parts a Metaphor
 
->>>>>>> Conform file to have EOL at end