From 37965723246a2a26e7ce2d675cb19fd011f8887c Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Thu, 27 Mar 2025 17:08:30 -0400
Subject: [PATCH] fix: Remains of merge conflict.

---
 zsh/config/.zshrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zsh/config/.zshrc b/zsh/config/.zshrc
index 80eb20e..937306b 100755
--- a/zsh/config/.zshrc
+++ b/zsh/config/.zshrc
@@ -216,7 +216,6 @@ source <(kubectl completion zsh)
 #       I tried sourcing them in the the `.zshenv` files, but did not work.
 _source_if "$ZDOTDIR/.zshrc-local"
 _source_if "$LOCAL_ENV"
-<<<<<<< HEAD
 
 # pnpm
 export PNPM_HOME="/Users/michael/.local/share/pnpm"