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

Conflicts: .vimrc
2016-09-13 00:23:42 -04:00
parent 9a6e7103be 1f26a09384
commit dc3ea0aa1e
7 changed files with 13 additions and 3 deletions
--- a/.vimrc
+++ b/.vimrc
@@ -29,6 +29,7 @@ set ignorecase
 set smartcase

 set background=dark
+set t_ut=

 execute pathogen#infect()