Permalink
Browse files

Merge branch 'master' of github.com:sergio101/vim_settings

Conflicts:
	vimrc
  • Loading branch information...
2 parents 1d152f1 + 863336b commit 37f3f53cc07b28dfcc3be5c88880c49a7dbacd99 @sergio101 committed Feb 17, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 vimrc
View
2 vimrc
@@ -22,7 +22,7 @@ Bundle 'https://github.com/tsaleh/vim-supertab.git'
Bundle 'git://github.com/altercation/vim-colors-solarized.git'
Bundle 'https://github.com/lukaszb/vim-web-indent.git'
Bundle 'https://github.com/vim-scripts/php.vim-html-enhanced.git'
-
+Bundle "https://github.com/scrooloose/nerdtree.git"
runtime! autoload/pathogen.vim
if exists('g:loaded_pathogen')

0 comments on commit 37f3f53

Please sign in to comment.