From eb9ec80c385adaddde68aeb4b7ea432a88ad33a3 Mon Sep 17 00:00:00 2001
From: petrucci4prez <natedwarshuis@gmail.com>
Date: Sat, 22 Sep 2018 08:05:41 -0700
Subject: [PATCH] added evil ediff to evil collection

---
 conf.org | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/conf.org b/conf.org
index fc40ce1..99ee760 100644
--- a/conf.org
+++ b/conf.org
@@ -2164,8 +2164,7 @@ Most packages that don't have an evil version are in this one. I don't like surp
   :after evil
   :init
   (setq evil-collection-mode-list
-		'(dired flycheck company which-key helm minibuffer mu4e ediff
-				term))
+		'(dired ediff flycheck company which-key helm minibuffer mu4e ediff	term))
   (setq evil-collection-setup-minibuffer t)
   :config
   (evil-collection-init))