diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:52:42 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:52:42 -0500 |
| commit | 739fa0ff2b7b0581b2d294f8de8b9e79234ed66c (patch) | |
| tree | 654bda35871bf30bdedc7b8e252c474f2c0f143e /.config/emacs/custom.el | |
| parent | 7a2dd3a7e3f465141c90abedcb814f9ee9712edd (diff) | |
Fix merge issues
Diffstat (limited to '.config/emacs/custom.el')
| -rw-r--r-- | .config/emacs/custom.el | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index ba22862..e4208b5 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -9,13 +9,6 @@ ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) '(erc-nick "lukeshu") '(explicit-shell-file-name "/bin/bash") - '(global-whitespace-mode nil) - '(inhibit-startup-screen t) - '(mdmua-maildir "~/Maildir") - '(minibuffer-prompt-properties - (quote - (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt))) - '(page-break-lines-char 45) '(ruby-deep-arglist nil) '(ruby-deep-indent-paren nil) '(safe-local-variable-values |