From 6d8b5a59b3e3d96af60f0833d3d3910cd9af0b19 Mon Sep 17 00:00:00 2001
From: Mark Phelps <mark.aaron.phelps@gmail.com>
Date: Sat, 4 Jan 2020 11:58:49 -0500
Subject: [PATCH] Remove merge marker in recipes.md

Remove <<<<<<< HEAD marker in recipes.md
---
 docs/recipes.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/recipes.md b/docs/recipes.md
index 04604e6d..08e51711 100644
--- a/docs/recipes.md
+++ b/docs/recipes.md
@@ -130,8 +130,6 @@ Similar to Sublime Text, MacVim must be started with a flag that tells
 the the process to wait until the file is closed before passing control
 back to journal. In the case of MacVim, this is `-f`:
 
-<<<<<<< HEAD
-
 ```yaml
 editor: "mvim -f"
 ```