fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge conflict left-over

Browse source
This commit is contained in:
Jesper Kjeldgaard 2019-12-03 11:59:05 +01:00
parent abc6b53898
commit 657eb8fcda
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/recipes.md
View file

@ -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 the the process to wait until the file is closed before passing control
back to journal. In the case of MacVim, this is `-f`: back to journal. In the case of MacVim, this is `-f`:
<<<<<<< HEAD
```yaml ```yaml
editor: "mvim -f" editor: "mvim -f"
``` ```