mirror of
https://github.com/nix-community/nixvim.git
synced 2025-06-23 09:18:38 +02:00
plugins: solve previously merged conflict (#168)
This commit is contained in:
parent
7ccb2b0608
commit
4c843574f7
1 changed files with 0 additions and 3 deletions
|
@ -58,10 +58,7 @@
|
|||
./utils/endwise.nix
|
||||
./utils/floaterm.nix
|
||||
./utils/goyo.nix
|
||||
<<<<<<< HEAD
|
||||
./utils/harpoon.nix
|
||||
=======
|
||||
>>>>>>> origin/main
|
||||
./utils/indent-blankline.nix
|
||||
./utils/intellitab.nix
|
||||
./utils/mark-radar.nix
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue