maksimrv   M export/_zsh.symlink/1zshinit
?? export/_oh-my-zsh/custom/plugins.symlink/st/
maksimrv   M export/_vim/_vimrcp.symlink
maksimrv   M export/_vim/_vimrcps.symlink
Merge branch 'master' of github.com:maksimr/dotfiles

Conflicts:
	export/_zsh.symlink/1zshinit