jon 4f3771f4ce Merge branch 'master' of ssh://jonfu.com/home/jon/dots ...

Conflicts:
	bash/.bashrc
	vim/.vim/bundle/calendar.vim
	vim/.vim/bundle/jedi-vim
	vim/.vim/bundle/lightline.vim
	vim/.vim/bundle/nerdtree
	vim/.vim/bundle/syntastic
	vim/.vim/bundle/vim-fugitive

2018-06-24 15:15:36 -05:00

..

bundle

Merge branch 'master' of ssh://jonfu.com/home/jon/dots

2018-06-24 15:15:36 -05:00

.netrwhist

Main thing here was adding enter mapping in vim to

2018-05-23 09:34:49 -05:00

dirindex.html

Updated some stuff (great msg right?)

2018-06-21 17:16:04 -05:00

index.html

Updated some stuff (great msg right?)

2018-06-21 17:16:04 -05:00