From: Peng Li <seudut@gmail.com>
Date: Thu, 18 Jun 2015 14:36:32 +0000 (+0800)
Subject: fix conflict
X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=595ca2fc90980bb1d776c84e00184d4ea24d87bf;p=dotfiles.git

fix conflict
---

595ca2fc90980bb1d776c84e00184d4ea24d87bf
diff --cc emacs.d/config/my-packages.el
index a0471d5,65d0cdc..f227581
--- a/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)