c494bbb82c36f86e0f70df8c1f18b2881b2b7c0c

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Resolving conflict in colorize patch #7742

Diff

 1diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
 2index 565ba5a36e4525eb8fb91898f99ecfc2eea791fd..a006a7828bed29ab3a8ba1c518155529ff8e082f 100644
 3--- a/plugins/colorize/colorize.plugin.zsh
 4+++ b/plugins/colorize/colorize.plugin.zsh
 5@@ -38,7 +38,7 @@ colorize_via_pygmentize() {
 6 
 7 colorize_via_pygmentize_less() (
 8     # this function is a subshell so tmp_files can be shared to cleanup function
 9-    declare -a tmp_files 
10+    declare -a tmp_files
11 
12     cleanup () {
13         [[ ${#tmp_files} -gt 0 ]] && rm -f "${tmp_files[@]}"