diff options
author | Robby Russell <robby@planetargon.com> | 2013-04-23 20:30:21 -0700 |
---|---|---|
committer | Robby Russell <robby@planetargon.com> | 2013-04-23 20:30:21 -0700 |
commit | a2c8db9eb34480dd3e2c9d91d4415ee7964d4764 (patch) | |
tree | df81da50cf79180310e09cde04282ffa4ed1fe06 /themes/crunch.zsh-theme | |
parent | 7cdb6d667c12ff4944d7e68eb519cc5bd6735bc3 (diff) | |
parent | 682961e9304c6bf7bd500d741b01640682d35ac9 (diff) | |
download | zsh-a2c8db9eb34480dd3e2c9d91d4415ee7964d4764.tar.gz zsh-a2c8db9eb34480dd3e2c9d91d4415ee7964d4764.tar.bz2 zsh-a2c8db9eb34480dd3e2c9d91d4415ee7964d4764.zip |
Resolving conflict in #1266 merge
Diffstat (limited to 'themes/crunch.zsh-theme')
0 files changed, 0 insertions, 0 deletions