Merge branch 'master' into dev

This commit is contained in:
romkatv 2019-07-24 16:34:33 +02:00
commit ed8dd826c5

View file

@ -508,5 +508,5 @@ function gitstatus_check() {
[[ -n ${(P)${:-GITSTATUS_DAEMON_PID_${1}}} ]]
}
(( ! p9k_lean_restore_aliases )) || setopt aliases
'builtin' 'unset' 'p9k_lean_restore_aliases'
(( ! _gitstatus_restore_aliases )) || setopt aliases
'builtin' 'unset' '_gitstatus_restore_aliases'