Fix merge conflict leftovers
This commit is contained in:
parent
fd74f59c39
commit
9271e8d037
|
@ -114,15 +114,10 @@ in {
|
||||||
# Highlight characters when using f, F, t, and T
|
# Highlight characters when using f, F, t, and T
|
||||||
quick-scope
|
quick-scope
|
||||||
|
|
||||||
# get sudo in vim; :SudaWrite <optional filename>
|
# Get sudo in vim; :SudaWrite <optional filename>
|
||||||
suda-vim
|
suda-vim
|
||||||
<<<<<<< Updated upstream
|
|
||||||
vim-gutentags
|
|
||||||
vim-vinegar
|
|
||||||
=======
|
|
||||||
|
|
||||||
# undo history etc. per project
|
# Undo history etc. per project
|
||||||
>>>>>>> Stashed changes
|
|
||||||
vim-workspace-nvfetcher
|
vim-workspace-nvfetcher
|
||||||
|
|
||||||
# JSON schemas
|
# JSON schemas
|
||||||
|
|
Loading…
Reference in a new issue