From 2f34d805d7a5ef43fd37c449b00a8c3affa2bc78 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 17 Oct 2018 22:26:57 +0200
Subject: Emacs: Fix evil/evil-collection compatibility

---
 emacs/.emacs.d/main.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 8f643c05..960ad8f3 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -2399,7 +2399,7 @@ Pass ARG to `comint-delchar-or-maybe-eof'."
 
 ;;;; Evil
 
-(setq evil-want-integration nil)
+(setq evil-want-keybinding nil)
 
 (use-package evil-leader
   ;; must load before evil-mode
-- 
cgit 1.4.1