diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-12-13 13:03:06 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-12-13 13:03:06 +0100 |
commit | 58daf59eeeee1818166ca80aabe62c52d4644bda (patch) | |
tree | 36ae96707b157e23b14b060e4d5a3496f72d429b | |
parent | cb2b10359dec3a47fd3bc6a35949022b47f905c7 (diff) | |
parent | b7cfd56c894beafbaf4f65594ac25cbcf895cb35 (diff) | |
download | vimrc-58daf59eeeee1818166ca80aabe62c52d4644bda.tar.gz vimrc-58daf59eeeee1818166ca80aabe62c52d4644bda.tar.bz2 vimrc-58daf59eeeee1818166ca80aabe62c52d4644bda.zip |
Merge branch 'master' of mpb.li:git/vimrc
Conflicts:
.gitignore
dotvimrc
-rw-r--r-- | dotvimrc | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -76,6 +76,7 @@ let g:syntastic_error_symbol='✗' let g:syntastic_warning_symbol='⚠' let g:Powerline_symbols = 'unicode' +NeoBundle 'Tag-Signature-Balloons' filetype plugin on filetype indent on |