From c9e395d30140b59100babb5ccb1b3f835f6862ac Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Tue, 26 Feb 2019 01:33:22 -0800
Subject: Move Ediff configuration to emacs-config

---
 emacs/.emacs.d/init.el | 1 -
 1 file changed, 1 deletion(-)

(limited to 'emacs/.emacs.d/init.el')

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 9c38785..9136e58 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -162,7 +162,6 @@
 ;;             (propertize (concat "  " (char-to-string #xf233))
 ;;                         'face '(:family "Font Awesome" :height 0.75))))
 
-(with-eval-after-load 'ediff (load "oni-ediff-init"))
 (with-eval-after-load 'elec-pair (load "oni-elec-pair-init"))
 (with-eval-after-load 'eshell (load "oni-eshell-init"))
 (with-eval-after-load 'gnus (load "oni-gnus-init"))
-- 
cgit v1.2.3-54-g00ecf