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

Remove merge marker in recipes.md

Browse source 
Remove <<<<<<< HEAD marker in recipes.md
This commit is contained in:
Mark Phelps 2020-01-04 11:58:49 -05:00 • committed by GitHub
parent 562454427e
commit 6d8b5a59b3
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"
```