From 533323544a7d6a20ebad32f03250fa47b25a35d3 Mon Sep 17 00:00:00 2001
From: Liam Malone <maloneliam@proton.me>
Date: Sun, 13 Oct 2024 15:23:10 +0200
Subject: [PATCH] .

---
 modules/old_configs/nvim/lua/liamm/remap.lua | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/old_configs/nvim/lua/liamm/remap.lua b/modules/old_configs/nvim/lua/liamm/remap.lua
index 8c19069..afb51bc 100644
--- a/modules/old_configs/nvim/lua/liamm/remap.lua
+++ b/modules/old_configs/nvim/lua/liamm/remap.lua
@@ -21,11 +21,7 @@ vim.keymap.set("n", "<leader>Y", "\"+Y")
 
 vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", {silent = true})
 
-<<<<<<< HEAD
--- put nvim to background 
-=======
 -- put to background 
->>>>>>> main
 vim.keymap.set("n", "<leader>bg", "<C-z>")
 
 -- BUILD SCRIPT INVOKATIONS