fix conflict

diff --cc emacs.d/config/my-packages.el
index a0471d5,65d0cdc..f227581
--- 1/emacs.d/config/my-packages.el
--- 2/emacs.d/config/my-packages.el
+++ b/emacs.d/config/my-packages.el
@@@ -51,7 -51,7 +51,8 @@@
      recentf-ext
      linum-relative
      jekyll-modes
 +    evil-escape
+     workgroups2
    ) "a list of packages to ensure are installed at launch.")
  
  (require 'cl)

diff --cc emacs.d/init.el
Simple merge