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

diff --git a/.gitignore.d/neovim b/.gitignore.d/neovim
index b9f3b54..fba3a58 100644
--- a/.gitignore.d/neovim
+++ b/.gitignore.d/neovim
@@ -1,9 +1,17 @@
 *
 !/.config/nvim/autoload/plug.vim
+!/.config/nvim/emojis.vim
 !/.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