(Emacs)-merge feature

This commit is contained in:
2022-01-13 04:58:39 +00:00
parent 461ba3f977
commit cd95e32696

View File

@@ -159,7 +159,6 @@ common use of this macro.
(setq pairs (cdr pairs)))) (setq pairs (cdr pairs))))
`(cond `(cond
,@current-lisp))) ,@current-lisp)))
>>>>>>> origin/master
#+end_src #+end_src
* Aesthetics * Aesthetics
Load my custom "personal-theme" theme which is stored in the Emacs lisp Load my custom "personal-theme" theme which is stored in the Emacs lisp