Merge remote-tracking branch 'refs/remotes/origin/master'

2018-07-08 10:58:13 -05:00
parent b30b90d1e0 70573e3500
commit 68b5930061
7 changed files with 6 additions and 7 deletions
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,7 +24,6 @@ alias p='ping'
 alias s='sudo'
 alias dmesg='dmesg -H'
 alias ip='ip -c'
 alias fart='/usr/bin/sleep'
 #golang stuff
 export GOPATH=$HOME/gopath
--- a/vim/.vim/bundle/calendar.vim
+++ b/vim/.vim/bundle/calendar.vim
--- a/vim/.vim/bundle/jedi-vim
+++ b/vim/.vim/bundle/jedi-vim
--- a/vim/.vim/bundle/lightline.vim
+++ b/vim/.vim/bundle/lightline.vim
--- a/vim/.vim/bundle/nerdtree
+++ b/vim/.vim/bundle/nerdtree
--- a/vim/.vim/bundle/syntastic
+++ b/vim/.vim/bundle/syntastic
--- a/vim/.vim/bundle/vim-fugitive
+++ b/vim/.vim/bundle/vim-fugitive