X-Git-Url: https://git.madduck.net/etc/neovim.git/blobdiff_plain/0fbf6f9a1656b07b4edb8d7023b15d12d204a61a..d0b245d0239059aa34f529d0be498df4ef9c1896:/.gitignore.d/neovim

diff --git a/.gitignore.d/neovim b/.gitignore.d/neovim
index 3b3a2ed..fba3a58 100644
--- a/.gitignore.d/neovim
+++ b/.gitignore.d/neovim
@@ -4,7 +4,14 @@
 !/.config/nvim/init.lua
 !/.config/nvim/keymaps.lua
 !/.config/nvim/options.lua
+<<<<<<< HEAD
+!/.config/nvim/plugin/ale.lua
 !/.config/nvim/plugin/highlight-yank.lua
+=======
+>>>>>>> 27ab3a2 (Import options from vimrc)
 !/.config/nvim/plugin/listmode.lua
+!/.config/nvim/plugin/lspconfig.lua
 !/.config/nvim/plugin/vim-artesanal.lua
+!/.config/nvim/plugin/vim-lastplace.lua
+!/.config/nvim/style.vim
 !/.gitignore.d/neovim