fix conflict

[dotfiles.git] / emacs.d / init.el

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 30bcab4..9580c7a 100644 (file)
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -152,7 +152,7 @@
 ;;;;(workgroups-mode 1)
 
 
-(require 'minibuffer-line)
+;;(require 'minibuffer-line)
 ;(minibuffer-line-mode 1)