plugins: solve previously merged conflict (#168)

This commit is contained in:
Gaétan Lepage 2023-02-18 10:59:45 +01:00 committed by GitHub
parent 7ccb2b0608
commit 4c843574f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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