fix conflict

diff --git a/emacs.d/config/my-packages.el b/emacs.d/config/my-packages.el
index a0471d5..f227581 100644 (file)
--- a/emacs.d/config/my-packages.el
+++ b/emacs.d/config/my-packages.el
@@ -52,6 +52,7 @@
     linum-relative
     jekyll-modes
     evil-escape
+    workgroups2
   ) "a list of packages to ensure are installed at launch.")
 
 (require 'cl)

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)