mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-08-07 03:15:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

plugins: solve previously merged conflict

Browse source
This commit is contained in:
Gaetan Lepage 2023-02-14 23:15:18 +01:00
parent 7ccb2b0608
commit f404e6f97d
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/default.nix
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