summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
authorJulian <julianteule@gmail.com>2018-03-01 15:03:28 +0100
committerJulian <julianteule@gmail.com>2018-03-01 15:03:28 +0100
commit6eb0f1ced5803b7e5450dd07de623a8486a1bab0 (patch)
tree27d0d05f279f5e1060a90e7b531d6e3fb19a01ca /.emacs
parent1afae165cabaa694b3f73479591f6b55ac2b9f7e (diff)
Stuff
Diffstat (limited to '.emacs')
-rw-r--r--.emacs2
1 files changed, 1 insertions, 1 deletions
diff --git a/.emacs b/.emacs
index a176df6..fcd70e3 100644
--- a/.emacs
+++ b/.emacs
@@ -197,7 +197,7 @@
(show-paren-mode 1)
-<<<<<<< HEAD
+
(require 'dired-single)
(defun my-dired-init ()