mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-20 13:08:31 +02:00
Remove merge marker in recipes.md
Remove <<<<<<< HEAD marker in recipes.md
This commit is contained in:
parent
562454427e
commit
6d8b5a59b3
1 changed files with 0 additions and 2 deletions
|
@ -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"
|
||||
```
|
||||
|
|
Loading…
Add table
Reference in a new issue