Merge branch 'master' of github.com:aarongut/dotfiles into material

Conflicts:
	.vimrc
This commit is contained in:
2016-03-31 14:44:20 -04:00
2 changed files with 13 additions and 0 deletions

7
.vimrc
View File

@@ -19,8 +19,15 @@ set smartindent
set showcmd
set laststatus=2
set noshowmode
set title
" Search betterer
set incsearch
colorscheme materialbox
set hlsearch
set ignorecase
set smartcase
set background=dark
execute pathogen#infect()