From c2a3b3b1d5577f0d6802aacdae707495c3eeb981 Mon Sep 17 00:00:00 2001
From: Derek Taylor <derek@distrotube.com>
Date: Sat, 13 Apr 2024 11:26:17 -0500
Subject: [PATCH] Minor edits.

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

diff --git a/.config/emacs/config.el b/.config/emacs/config.el
index bc78b29..690a04c 100644
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -730,7 +730,3 @@
     (browse-url
      (concat "https://github.com/search?l=" language
              "&type=code&q=" code))))
-<<<<<<< HEAD
-
-=======
->>>>>>> 987492dc041b7a12f6a57be035df64dd74fc6c09