Dircolors
Conflicting Changes
Merge branch 'master' of github.com:gmickel/dotfiles
conflicting changes
Merge branch 'master' of github.com:gmickel/dotfiles
no longer needed