Josh Sherman d9fadb44ea Merge branch 'master' of https://github.com/joshtronic/dotfiles ... Conflicts: zsh/zshrc		2015-11-24 19:57:16 -05:00
..
agnoster.zsh-theme	Tmux and new theme	2015-09-26 22:13:09 -04:00
joshtronic-2012.zsh-theme	That old theme tho	2015-09-27 10:44:47 -04:00
joshtronic-2014.zsh-theme	Added year suffix to be able to differentiate my themes	2015-09-27 10:43:44 -04:00
joshtronic-2015.zsh-theme	Changes on my laptop	2015-11-24 19:55:47 -05:00
zshrc	Merge branch 'master' of https://github.com/joshtronic/dotfiles	2015-11-24 19:57:16 -05:00