From 7a9e7b6d6a51eb033e5390f0a1d4c894e479cd7d Mon Sep 17 00:00:00 2001
From: Derek Taylor <derek@distrotube.com>
Date: Fri, 12 Apr 2024 12:43:46 -0500
Subject: [PATCH] Minor edits.

---
 .config/emacs/config.org | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.config/emacs/config.org b/.config/emacs/config.org
index 55d4510..e363840 100644
--- a/.config/emacs/config.org
+++ b/.config/emacs/config.org
@@ -1061,7 +1061,3 @@ With Emacs version 29, true transparency has been added.  I have turned transpar
              "&type=code&q=" code))))
   
 #+end_src
-<<<<<<< HEAD
-
-=======
->>>>>>> 987492dc041b7a12f6a57be035df64dd74fc6c09