mirror of
https://github.com/nix-community/nixvim.git
synced 2026-09-25 16:50:23 -04:00
plugins: solve previously merged conflict (#168)
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user