Revert "Disable evil-ediff for now"

This reverts commit 4dbd5e6110.
2018-08-27 18:21:17 +03:00 · 2018-08-27 18:21:17 +03:00 · ae00b1c70a
parent cea81dd0ce
commit ae00b1c70a
1 changed files with 1 additions and 2 deletions
--- a/layers/+spacemacs/spacemacs-evil/packages.el
+++ b/layers/+spacemacs/spacemacs-evil/packages.el
@ -13,8 +13,7 @@
      '(evil-anzu
        evil-args
        evil-cleverparens
-        ;; this package has been moved, need to import it to Spacemacs
-        ;; evil-ediff
+        evil-ediff
        evil-escape
        evil-exchange
        evil-goggles