From b6022fe7948825d5452bebc780cb4f919eb9cf12 Mon Sep 17 00:00:00 2001
From: "Vito G. Graffagnino" <vito@graffagnino.xyz>
Date: Fri, 3 Jun 2022 18:08:51 +0100
Subject: Removed surplus characters from previous merge attempt

---
 lua/user/keymaps.lua | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lua/user')

diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index d6db5cd..49087c7 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -62,7 +62,6 @@ keymap("t", "<C-h>", "<C-\\><C-N><C-w>h", term_opts)
 keymap("t", "<C-j>", "<C-\\><C-N><C-w>j", term_opts)
 keymap("t", "<C-k>", "<C-\\><C-N><C-w>k", term_opts)
 keymap("t", "<C-l>", "<C-\\><C-N><C-w>l", term_opts)
->>>>>>> vgg
 
 -- Nvimtree
 keymap("n", "<leader>e", ":NvimTreeToggle<cr>", opts)
-- 
cgit v1.2.3