From d362e34fd1044ae09158eb10243a7ec2cc502a4d Mon Sep 17 00:00:00 2001
From: "Vito G. Graffagnino" <vito@graffagnino.xyz>
Date: Mon, 30 May 2022 22:40:25 +0100
Subject: plugins.lua

---
 lua/user/plugins.lua | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lua/user')

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"
-- 
cgit v1.2.3