From 64d354ae35ccb981ca3142c1724e97dd343c99a5 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 12 Jun 2018 17:45:13 +0200
Subject: [PATCH] emacs/ediff: remove evil-ediff package

Evil+ediff integration was merged into evil-collection.
---
 modules/emacs/ediff/config.el   | 9 ---------
 modules/emacs/ediff/packages.el | 5 -----
 2 files changed, 14 deletions(-)
 delete mode 100644 modules/emacs/ediff/packages.el

diff --git a/modules/emacs/ediff/config.el b/modules/emacs/ediff/config.el
index 9a9cea372..120a3ebdd 100644
--- a/modules/emacs/ediff/config.el
+++ b/modules/emacs/ediff/config.el
@@ -14,12 +14,3 @@
   (set-window-configuration +ediff--saved-wconf))
 (add-hook 'ediff-before-setup-hook #'+ediff|save-wconf)
 (add-hook! '(ediff-quit-hook ediff-suspend-hook) #'+ediff|restore-wconf 'append)
-
-
-;;
-;; Plugins
-;;
-
-(def-package! evil-ediff
-  :when (featurep! :feature evil)
-  :after ediff)
diff --git a/modules/emacs/ediff/packages.el b/modules/emacs/ediff/packages.el
deleted file mode 100644
index 6b06cb319..000000000
--- a/modules/emacs/ediff/packages.el
+++ /dev/null
@@ -1,5 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; emacs/ediff/packages.el
-
-(when (featurep! :feature evil)
-  (package! evil-ediff))