summaryrefslogtreecommitdiff
path: root/lua/user
diff options
context:
space:
mode:
Diffstat (limited to 'lua/user')
-rw-r--r--lua/user/plugins.lua3
1 files changed, 0 insertions, 3 deletions
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index 5893e92..56ef86d 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -73,10 +73,7 @@ return packer.startup(function(use)
-- LSP
use "neovim/nvim-lspconfig" -- enable LSP
use "williamboman/nvim-lsp-installer" -- simple to use language server installer
-<<<<<<< HEAD
use "jose-elias-alvarez/null-ls.nvim" -- for formatters and linters
-=======
->>>>>>> vgg
-- Telescope
use "nvim-telescope/telescope.nvim"