From 8a5f61b47f9a8eb1d5d9a6c0a65001aead4ca24b Mon Sep 17 00:00:00 2001
From: psox <psox(at)st8l.com>
Date: Tue, 13 Sep 2022 20:05:51 +0100
Subject: [PATCH] finish merge

---
 zshrc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/zshrc b/zshrc
index f8ac9f9..fd5e021 100755
--- a/zshrc
+++ b/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