dolysis
/
psoxizsh
3
1
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zshrc
View File

@ -141,12 +141,8 @@ fi
if [[ -d ~/.ssh ]] if [[ -d ~/.ssh ]]
then then
zstyle :omz:plugins:ssh-agent lifetime 36h zstyle :omz:plugins:ssh-agent lifetime 36h
<<<<<<< HEAD
if [[ -e ~/.ssh/autoload ]]
=======
zstyle :omz:plugins:ssh-agent agent-forwarding on zstyle :omz:plugins:ssh-agent agent-forwarding on
if [[ -e ~/.ssh/autoload ]] if [[ -e ~/.ssh/autoload ]]
>>>>>>> develop
then then
zstyle :omz:plugins:ssh-agent identities $( cat ~/.ssh/autoload ) zstyle :omz:plugins:ssh-agent identities $( cat ~/.ssh/autoload )
fi fi