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

Browse Source

Conflicts:
	vim/.vim/bundle/lightline.vim

...

This commit is contained in:

Jon Dossey

2018-06-21 17:17:51 -05:00

parent e6fbc77181 164ab9f4d8

commit 8f3230921e

10 changed files with 126 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1

vim/.vim/bundle/targets.vim Submodule

Submodule vim/.vim/bundle/targets.vim added at c3042dc18a

2

vim/.vim/bundle/vim-airline

Submodule vim/.vim/bundle/vim-airline updated: e9a7a12d9e...396cc92261

2

vim/.vim/bundle/vim-airline-themes

Submodule vim/.vim/bundle/vim-airline-themes updated: 08c76e4cd0...26f67b9265

1

vim/.vim/bundle/vim-buftabline Submodule

Submodule vim/.vim/bundle/vim-buftabline added at 14d208b1fa