From bc89d3b7935acd562aa687f6d6bdf7d08c3d3830 Mon Sep 17 00:00:00 2001 From: Susan Quigley Date: Mon, 29 Jul 2019 20:27:50 +0000 Subject: [PATCH] Issue 132 Conflict Error - Corrected --- jit/figs-hypo/01.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jit/figs-hypo/01.md b/jit/figs-hypo/01.md index 4114032..cdfb324 100644 --- a/jit/figs-hypo/01.md +++ b/jit/figs-hypo/01.md @@ -65,9 +65,6 @@ Use your language's ways of showing these kinds of things. ### Translation Strategies -<<<<<<< HEAD There are no translation strategies for this topic. -======= -There are not translation strategies for this topic. ->>>>>>> Conform file to have EOL at end +