Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42c26f9e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix conflict with common zsh alias" am: fd4a4061 am: 650771c5 am:... 

Merge "Fix conflict with common zsh alias" am: fd4a4061 am: 650771c5 am: 1c056cfb am: 43e38787

Original change: https://android-review.googlesource.com/c/platform/build/+/1434523

Change-Id: Ifda0651290b5133331243bcf0fa02f29d30ef232
parents ebb85cc2 43e38787

envsetup.sh

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ function should_add_completion() { 


function addcompletions()

{

    local T dir f

    local f=



    # Keep us from trying to run in something that's neither bash nor zsh.

    if [ -z "$BASH_VERSION" -a -z "$ZSH_VERSION" ]; then