finish merge
This commit is contained in:
parent
9fbd124ee0
commit
8a5f61b47f
6
zshrc
6
zshrc
|
@ -141,12 +141,8 @@ fi
|
|||
if [[ -d ~/.ssh ]]
|
||||
then
|
||||
zstyle :omz:plugins:ssh-agent lifetime 36h
|
||||
<<<<<<< HEAD
|
||||
if [[ -e ~/.ssh/autoload ]]
|
||||
=======
|
||||
zstyle :omz:plugins:ssh-agent agent-forwarding on
|
||||
if [[ -e ~/.ssh/autoload ]]
|
||||
>>>>>>> develop
|
||||
if [[ -e ~/.ssh/autoload ]]
|
||||
then
|
||||
zstyle :omz:plugins:ssh-agent identities $( cat ~/.ssh/autoload )
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue