From 3a69dcba2db9871145aeee8b243f9d3df7bb8316 Mon Sep 17 00:00:00 2001
From: Chad Nelson <cnelson@mailbox.org>
Date: Thu, 27 Feb 2025 10:38:59 -0700
Subject: [PATCH] fixed .gitignore

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

diff --git a/.gitignore b/.gitignore
index 15f8b60..82fa64e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,17 +10,10 @@ projects
 recentf
 transient
 tree-sitter
-<<<<<<< HEAD
-**/*.el
-=======
 **/*.el
 !.dir-locals.el
 eshell
 request
-<<<<<<< HEAD
->>>>>>> be5987a (added dir locals to allow emacs submodule as a project)
-=======
 /.cache/
 /mastodon.plstore
 /persist/
->>>>>>> c7ec4a3 (Added new packages/emojis)