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

Merge pull request #767 from thejspr/patch-1

Browse source 
Fix merge conflict left-over
This commit is contained in:
Jonathan Wren 2019-12-03 08:11:29 -08:00 • committed by GitHub
commit a1d3577e3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
back to journal. In the case of MacVim, this is `-f`:
<<<<<<< HEAD
```yaml
editor: "mvim -f"
```