conflict
mutt/mailboxes not to version
conficts
its necessary

Merge branch 'master' of github.com:cinghiopinghio/config-files
technical commit
solved