(Emacs)-merge feature

2022-01-13 04:58:39 +00:00
parent 461ba3f977
commit cd95e32696
1 changed files with 0 additions and 1 deletions
--- a/Emacs/.config/emacs/config.org
+++ b/Emacs/.config/emacs/config.org
@@ -159,7 +159,6 @@ common use of this macro.
        (setq pairs (cdr pairs))))
    `(cond
      ,@current-lisp)))
->>>>>>> origin/master
 #+end_src
 * Aesthetics
 Load my custom "personal-theme" theme which is stored in the Emacs lisp