fix conflict
authorPeng Li <seudut@gmail.com>
Fri, 24 Jul 2015 01:59:36 +0000 (09:59 +0800)
committerPeng Li <seudut@gmail.com>
Fri, 24 Jul 2015 01:59:36 +0000 (09:59 +0800)
commit3f6be1036862ef97dd2ddb4ba4e1bc40803e51ec
tree49b1adb1f087db6dc2431f99ce5e6242cf7644d3
parentead4f202d58421c31b50ef662d1ee5429543599c
parent3c1631f21494d88e50fc25f7bc1c23f0ec434982
fix conflict
vim/vimrc