Merge branch 'master' of gitlab.com:tyrelsouza/dotfiles

This commit is contained in:
Tyrel Souza 2017-06-22 09:56:13 -04:00
commit 65c5c91a67
No known key found for this signature in database
GPG Key ID: 2EECB5087209E6A5
2 changed files with 3 additions and 3 deletions

View File

@ -13,3 +13,4 @@ tmp/**/*
.ruby-version .ruby-version
release_package.sh release_package.sh
local.fish local.fish
local.env

5
vimrc
View File

@ -159,7 +159,6 @@ endif
set tags=./.tags; set tags=./.tags;
let g:tagbar_ctags_bin='/usr/local/bin/ctags' let g:tagbar_ctags_bin='/usr/local/bin/ctags'
let g:session_autoload = 'no' let g:session_autoload = 'no'
let g:airline#extensions#tabline#fnamemod = ':.' let g:airline#extensions#tabline#fnamemod = ':.'
let g:ctrlp_working_path_mode = 0
let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git|.pyc'