plugins: resolve conflict

This commit is contained in:
LightQuantum 2023-02-17 00:12:14 +08:00
parent 7ccb2b0608
commit 023fbd2801
No known key found for this signature in database
GPG key ID: 488E05BFDD880F00

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