From: sev <git@sev.monster>
Date: Mon, 4 Mar 2024 17:11:21 +0000 (-0600)
Subject: zsh: remove erroneously retained merge text
X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/commitdiff_plain/20c4ef4e3c48fb859e41a7fa2f286cd970907709?hp=99195fcfc0422133171dcd25791bdf32a2b4aca3

zsh: remove erroneously retained merge text
---

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