b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix merge conflict leftovers

Browse source
This commit is contained in:
teutat3s 2023-07-14 13:13:13 +02:00
parent fd74f59c39
commit 9271e8d037
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/terminal-life/nvim/default.nix
View file

@ -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