Merge remote-tracking branch 'origin/master' into everard

This commit is contained in:
Thomas Ruoff
2014-07-16 11:52:00 +02:00

1
vimrc
View File

@@ -13,7 +13,6 @@ Plugin 'gmarik/Vundle.vim'
Plugin 'L9'
Plugin 'unimpaired.vim'
Plugin 'clones/vim-fuzzyfinder'
Plugin 'scrooloose/nerdtree'
Plugin 'kien/ctrlp.vim'
Plugin 'maxbrunsfeld/vim-yankstack', {'name': 'yankstack'}