Resolve conflict

2019-07-08 14:59:10 -04:00 · 2019-07-08 14:59:10 -04:00 · 337ffa802b
parent 6ecb867fef
commit 337ffa802b
1 changed files with 0 additions and 4 deletions
--- 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