diff options
| author | Julian Teu <julianteu@protonmail.com> | 2018-02-08 13:53:21 +0100 |
|---|---|---|
| committer | Julian Teu <julianteu@protonmail.com> | 2018-02-08 13:53:21 +0100 |
| commit | eddb513fc861248d95e2e8f21ce1ffd6c8ce7ab7 (patch) | |
| tree | d92b6ec6dcdc5a53208f5db7a505f095d965204f | |
| parent | 8d7942a9132d389e2b7f7a5c5917eebe80741c0d (diff) | |
| parent | a9f5b9fdff61118fff5f81da4f1aed9a89d65b56 (diff) | |
Resolved merge conflict
| -rw-r--r-- | .emacs | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -197,6 +197,7 @@ (show-paren-mode 1) +<<<<<<< HEAD (require 'dired-single) (defun my-dired-init () @@ -230,3 +231,11 @@ (C . t) )) +(require 'evil) +(evil-mode 1) + +(require 'evil-surround) +(global-evil-surround-mode 1) + +(display-time-mode 1) +(display-battery-mode 1) |