From 657eb8fcda47aa3ecaaf93243fb2011b380a2882 Mon Sep 17 00:00:00 2001 From: Jesper Kjeldgaard Date: Tue, 3 Dec 2019 11:59:05 +0100 Subject: [PATCH] Fix merge conflict left-over --- 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" ```