From f6c23ab11aa1e0add13f7d7d0966f40eace3c5b5 Mon Sep 17 00:00:00 2001
From: Chris <christopher@ezekia.com>
Date: Thu, 24 Apr 2025 12:02:34 +0100
Subject: [PATCH] Fix merge conflict

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

diff --git a/lua/autocmd.lua b/lua/autocmd.lua
index 6ea4bd6..aa63f49 100644
--- a/lua/autocmd.lua
+++ b/lua/autocmd.lua
@@ -67,7 +67,6 @@ vim.api.nvim_create_autocmd({ 'User' }, {
     end,
 })
 
-<<<<<<< HEAD
 vim.api.nvim_create_autocmd('BufEnter', {
     callback = function(event)
         local windows = vim.api.nvim_list_wins()