Merge branch 'master' of https://github.com/galigalikun/dotfiles
t
Merge branch 'master' of https://github.com/galigalikun/dotfiles
Merge branch 'master' of https://github.com/galigalikun/dotfiles
erlang
a
Merge branch 'master' of https://github.com/galigalikun/dotfiles

Conflicts:
	brewfile
	home/.zshrc
gitignore
cmake
Merge branch 'master' of https://github.com/galigalikun/dotfiles

Conflicts:
	home/.vim/.netrwhist
	home/.vim/bundle/.neobundle/install_info