finish merge

This commit is contained in:
psox 2022-09-13 20:05:51 +01:00
parent 9fbd124ee0
commit 8a5f61b47f
1 changed files with 1 additions and 5 deletions

6
zshrc
View File

@ -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