From 0d6562c87c7e2568e55392787fc0137e4d4f1664 Mon Sep 17 00:00:00 2001
From: Michael Beasley <youvegotmoxie@gmail.com>
Date: Thu, 31 Oct 2024 12:29:35 -0500
Subject: [PATCH] Update init.lua

---
 init.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/init.lua b/init.lua
index 7df16af5..3fb20cbd 100644
--- a/init.lua
+++ b/init.lua
@@ -1020,7 +1020,6 @@ require('lazy').setup({
   -- Or use telescope!
   -- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
   -- you can continue same window with `<space>sr` which resumes last telescope search
->>>>>>> 2ba39c69736597b60f6033aa3f8526e7c28343d5
 }, {
   ui = {
     -- If you are using a Nerd Font: set icons to an empty table which will use the