diff options
author | Trae Robrock <trobrock@gmail.com> | 2011-12-20 18:15:19 -0800 |
---|---|---|
committer | Robby Russell <robby@planetargon.com> | 2012-12-02 12:30:46 -0800 |
commit | fe094712fb0c896eeec55b686807011226bc9208 (patch) | |
tree | a6a040e360f5dc6dff0233272c010c849a18a90d /oh-my-zsh.sh | |
parent | b2b77be56f35a9753e7491fd88b3c4b7ec74c586 (diff) | |
download | zsh-fe094712fb0c896eeec55b686807011226bc9208.tar.gz zsh-fe094712fb0c896eeec55b686807011226bc9208.tar.bz2 zsh-fe094712fb0c896eeec55b686807011226bc9208.zip |
resolving conflict in termsupport plugin
Diffstat (limited to 'oh-my-zsh.sh')
0 files changed, 0 insertions, 0 deletions