james/dotfiles
1
0
Fork 0
Code Issues 7 Pull Requests Releases Activity

Fixed bad merge.

Browse Source
This commit is contained in:
James Patrick 2023-01-23 18:45:52 -05:00
parent bedcb465ed
commit 5fc4528731
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emacs/config.el
View File

@ -8,13 +8,8 @@
;; Firacode is broken with Emacs-plus on osx. Fallback to Hasklig
(setq doom-font (font-spec :family "Hasklig" :size 14)
<<<<<<< HEAD
doom-variable-pitch-font (font-spec :family "ETbembo" :size 19)
doom-big-font (font-spec :family "Hasklig" :size 16))
=======
doom-variable-pitch-font (font-spec :family "Alegreya" :size 17)
doom-big-font (font-spec :family "Hasklig" :size 17))
>>>>>>> 65c8b81 (You know I think I may need glasses at some point.)
;; Set font
(pcase (system-name)