diff options
author | Robby Russell <robby@planetargon.com> | 2015-07-06 09:33:43 -0700 |
---|---|---|
committer | Robby Russell <robby@planetargon.com> | 2015-07-06 09:33:43 -0700 |
commit | 3ea33841863c4f5f22a27e64ae7950d901b674af (patch) | |
tree | d6961ad00c8a94b852aa62c5c12e632229c497b4 /tools | |
parent | c968346e1793d64ea19f7e494d9fea391843823c (diff) | |
parent | d0670aa2bd5186357961dd90c4a97c2c3842f728 (diff) | |
download | zsh-3ea33841863c4f5f22a27e64ae7950d901b674af.tar.gz zsh-3ea33841863c4f5f22a27e64ae7950d901b674af.tar.bz2 zsh-3ea33841863c4f5f22a27e64ae7950d901b674af.zip |
Merge pull request #4041 from apjanke/fix-jira-prefix-comment-merge
Fix jira plugin syntax error due to merge conflict
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions