modified:   aliases.zsh
modified:   zsh/aliases.zsh
modified:   zsh/completions.zsh
modified:   zsh/functions.zsh
modified:   zsh/modules.zsh
modified:   zsh/variables.zsh
modified:   zsh/zshrc
Merge branch 'master' of github.com:horosgrisa/dotfiles

Conflicts:
	zsh/zshrc

modified:   zsh/zshrc