merge

2024-10-13 15:21:33 +02:00
parent 13cf1e25aa 08ca5fa888
commit f74a2f2468
1 changed files with 4 additions and 0 deletions
@@ -21,7 +21,11 @@ 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