fix conflict
authorPeng Li <seudut@gmail.com>
Thu, 18 Jun 2015 14:36:32 +0000 (22:36 +0800)
committerPeng Li <seudut@gmail.com>
Thu, 18 Jun 2015 14:37:40 +0000 (22:37 +0800)
commit595ca2fc90980bb1d776c84e00184d4ea24d87bf
tree200536fa275be47994397d335a70a21b5a02a208
parent26822a21ae3aab75b407d75dcc79f4d935fd1e95
parent6150cd9d9e10c10dfef605ab236f54fed633d600
fix conflict
emacs.d/config/my-packages.el
emacs.d/init.el