aboutsummaryrefslogtreecommitdiff
path: root/Emacs/.config/emacs/config.org
diff options
context:
space:
mode:
Diffstat (limited to 'Emacs/.config/emacs/config.org')
-rw-r--r--Emacs/.config/emacs/config.org1
1 files changed, 0 insertions, 1 deletions
diff --git a/Emacs/.config/emacs/config.org b/Emacs/.config/emacs/config.org
index 2f45cb2..15045ea 100644
--- 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