From 52058e7caa91b974c611040d96db1aeafb43b7f2 Mon Sep 17 00:00:00 2001
From: Andrew Davidson <andrew@amd.im>
Date: Fri, 11 Oct 2024 07:28:05 -0700
Subject: [PATCH] fixing merge issues

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5be71c7..04d2d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,5 @@
 vim/.vim/plugged
 vim/.vim/autoload
 zsh/.zsh/cache
-<<<<<<< HEAD
 .DS_Store
-=======
 gnupg
->>>>>>> origin/main