Minor edits.

2026-04-21 18:40:26 +10:00 · 2024-04-12 12:42:08 -05:00
parent 0d3d5070db 987492dc04
commit 258a6ea7e6
2 changed files with 6 additions and 0 deletions
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -730,4 +730,7 @@
    (browse-url
     (concat "https://github.com/search?l=" language
             "&type=code&q=" code))))
+<<<<<<< HEAD

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

+=======
+>>>>>>> 987492dc041b7a12f6a57be035df64dd74fc6c09