summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2019-12-20 22:43:20 -0800
committerRobby Russell <robby@planetargon.com>2019-12-20 22:43:20 -0800
commitc494bbb82c36f86e0f70df8c1f18b2881b2b7c0c (patch)
treea312b8365e9ea96232a64f269e7687082d5c416d
parent16ef5cca44d23fbde33de77cf44d0f05804d43e9 (diff)
parent67e0ef7aa6a494b2357c64a204214f7b19fb52e7 (diff)
downloadzsh-c494bbb82c36f86e0f70df8c1f18b2881b2b7c0c.tar.gz
zsh-c494bbb82c36f86e0f70df8c1f18b2881b2b7c0c.tar.bz2
zsh-c494bbb82c36f86e0f70df8c1f18b2881b2b7c0c.zip
Resolving conflict in colorize patch #7742
-rw-r--r--plugins/colorize/colorize.plugin.zsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 565ba5a36..a006a7828 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -38,7 +38,7 @@ colorize_via_pygmentize() {
colorize_via_pygmentize_less() (
# this function is a subshell so tmp_files can be shared to cleanup function
- declare -a tmp_files
+ declare -a tmp_files
cleanup () {
[[ ${#tmp_files} -gt 0 ]] && rm -f "${tmp_files[@]}"