fix merge issues

This commit is contained in:
Daniel Flanagan 2016-07-31 21:05:14 -05:00
parent bc84634d8a
commit 46d6ad4258

View file

@ -1,3 +1,3 @@
autoload *
bundle !init.vim
undo !./colors/*.vim