diff options
| author | Aryadev Chavali <aryadev@aryadevchavali.com> | 2022-01-13 04:58:39 +0000 |
|---|---|---|
| committer | Aryadev Chavali <aryadev@aryadevchavali.com> | 2022-01-13 04:58:39 +0000 |
| commit | cd95e326963e750405c7ff94681c0edc11c4f207 (patch) | |
| tree | 7bde7655890663f5b4871aa6407beb90e241b36a /Emacs/.config/emacs/config.org | |
| parent | 461ba3f977a580e1c3f136c677e7ec6253f2775b (diff) | |
| download | dotfiles-cd95e326963e750405c7ff94681c0edc11c4f207.tar.gz dotfiles-cd95e326963e750405c7ff94681c0edc11c4f207.tar.bz2 dotfiles-cd95e326963e750405c7ff94681c0edc11c4f207.zip | |
(Emacs)-merge feature
Diffstat (limited to 'Emacs/.config/emacs/config.org')
| -rw-r--r-- | Emacs/.config/emacs/config.org | 1 |
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 |