diff options
| author | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
|---|---|---|
| committer | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
| commit | e6ccd37b0563b4e7b34c41034766b9789e43ee5c (patch) | |
| tree | c12c8c2c6437fd7d5d3ec5bff27634a80759b808 /plugins/rand-quote | |
| parent | 30ef85664822595e29acdbc840c45d5772d84b5d (diff) | |
| parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
| download | zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.gz zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.bz2 zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.zip | |
Merge master (rebase being super annoying). Fix conflicts
Diffstat (limited to 'plugins/rand-quote')
| -rw-r--r-- | plugins/rand-quote/rand-quote.plugin.zsh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh index c3bf6234e..8f345d9aa 100644 --- a/plugins/rand-quote/rand-quote.plugin.zsh +++ b/plugins/rand-quote/rand-quote.plugin.zsh @@ -18,8 +18,6 @@ if [[ -x `which curl` ]]; then W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g') if [ "$W" -a "$TXT" ]; then echo "${WHO_COLOR}${W}${COLON_COLOR}: ${TEXT_COLOR}“${TXT}”${END_COLOR}" - else - quote fi } #quote |