From e261f73e113715b0175cf8e8663983fb25b90cba Mon Sep 17 00:00:00 2001
From: Steve <47467008+mr0xb@users.noreply.github.com>
Date: Thu, 28 May 2026 10:01:20 -0400
Subject: [PATCH] Update work.zsh

---
 .zshrc.d/work.zsh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.zshrc.d/work.zsh b/.zshrc.d/work.zsh
index 32ccdff..a2fcd07 100644
--- a/.zshrc.d/work.zsh
+++ b/.zshrc.d/work.zsh
@@ -1,8 +1,5 @@
 [ -f $HOME/.config/.vault ] && source ~/.config/.vault
-<<<<<<< HEAD
-=======
 [ -f $HOME/.vault-token ] && source ~/.vault-token
->>>>>>> 64f3fcd (updates)
 
 export AWS_VAULT_BACKEND=keychain
 export AWS_VAULT_KEYCHAIN_NAME="aws-vault"