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

diff --git a/.gitignore.d/neovim b/.gitignore.d/neovim
index d5d9387..fba3a58 100644
--- a/.gitignore.d/neovim
+++ b/.gitignore.d/neovim
@@ -4,8 +4,11 @@
 !/.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