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/emotty/emotty_floral_set.zsh | |
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/emotty/emotty_floral_set.zsh')
-rw-r--r-- | plugins/emotty/emotty_floral_set.zsh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/plugins/emotty/emotty_floral_set.zsh b/plugins/emotty/emotty_floral_set.zsh new file mode 100644 index 000000000..f761feae6 --- /dev/null +++ b/plugins/emotty/emotty_floral_set.zsh @@ -0,0 +1,18 @@ +#!/usr/bin/env zsh +# vim:ft=zsh ts=2 sw=2 sts=2 + +_emotty_sets[floral]=" + hibiscus + cherry_blossom + blossom + sunflower + bouquet + tulip + rose + four_leaf_clover + seedling + herb + palm_tree + evergreen_tree + deciduous_tree + " |