modified:   dotfiles/CentOS/.conkyrc3
Updated
Merge branch 'master' of github.com:sergiuniculescu/configs

Conflicts:
	dotfiles/CentOS/.conkyrc3