jomido 887040c0dc Fixing merge conflicts and stuff

2019-03-14 15:59:26 -05:00

..

.bash_profile

Added all dotfiles

2017-07-09 19:22:08 -05:00

.bashrc

Fixing merge conflicts and stuff

2019-03-14 15:59:26 -05:00