2 Commits

Author	SHA1	Message	Date
Andrei Stoica	48cff4710f	fixed merge conflict	2018-06-07 00:02:16 -04:00
Andrei Stoica	33173641cc	moved bash_aliases to aliases to use with zsh and bash	2018-06-05 13:51:45 -04:00