From 20c4ef4e3c48fb859e41a7fa2f286cd970907709 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 4 Mar 2024 11:11:21 -0600
Subject: [PATCH] zsh: remove erroneously retained merge text

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

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index 1972179..d1d10dd 100644
--- a/etc/zsh/.zshrc
+++ b/etc/zsh/.zshrc
@@ -274,7 +274,6 @@ alias dfu='d=${$(echo -E - ~/.zshenv):P:h:h};GIT_DIR=$d/.git GIT_WORK_TREE=$d {
   git submodules sync &&
   git submodules update
 }'
->>>>>>> Stashed changes
 
 ### hooks
 autoload -Uz add-zsh-hook
-- 
2.47.0