From: Peng Li <seudut@gmail.com>
Date: Fri, 24 Jul 2015 01:59:36 +0000 (+0800)
Subject: fix conflict
X-Git-Url: http://47.100.26.94:8080/?a=commitdiff_plain;h=3f6be1036862ef97dd2ddb4ba4e1bc40803e51ec;hp=3f6be1036862ef97dd2ddb4ba4e1bc40803e51ec;p=dotfiles.git

fix conflict
---