yeah
This commit is contained in:
parent
59828cc047
commit
5bda7cba9b
1 changed files with 0 additions and 5 deletions
|
@ -206,11 +206,6 @@ kept-old-versions 5)
|
|||
:config
|
||||
(load-theme 'doom-monokai-spectrum t))
|
||||
|
||||
<<<<<<< HEAD
|
||||
(use-package monokai-theme
|
||||
:config
|
||||
(load-theme 'monokai t))
|
||||
=======
|
||||
;; emacsclient things
|
||||
(setq frame-resize-pixelwise t)
|
||||
;; ui settings apparently go below
|
||||
|
|
Loading…
Reference in a new issue