Merge branch 'master' of github.com:voidcontext/dotfiles

Conflicts: .vimrc
voidcontext · Mar 25, 2014 · c1e108f · c1e108f
2 parents 1e4e7f5 + d1823f7
commit c1e108f
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.vimrc b/.vimrc
@@ -125,7 +125,6 @@ set list lcs=tab:\|\▸
 
 "
 let g:signify_vcs_list = [ 'git' ]  
-
 " NeoComplCache settings
 
 " Use neocomplcache.