mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-08-24 03:05:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

plugins: fix merge error

Browse source 
This error was introduced by commit 13943b4 and causes a syntax error
This commit is contained in:
Robert Ricci 2023-02-17 22:41:00 -07:00
parent 7ccb2b0608
commit b417ea8833
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/endwise.nix
./utils/floaterm.nix ./utils/floaterm.nix
./utils/goyo.nix ./utils/goyo.nix
<<<<<<< HEAD
./utils/harpoon.nix ./utils/harpoon.nix
=======
>>>>>>> origin/main
./utils/indent-blankline.nix ./utils/indent-blankline.nix
./utils/intellitab.nix ./utils/intellitab.nix
./utils/mark-radar.nix ./utils/mark-radar.nix