zsh: remove erroneously retained merge text

diff --git a/etc/zsh/.zshrc b/etc/zsh/.zshrc
index 1972179b845da5c9729087918069902b03cb2f34..d1d10ddb528e0bbcef30e58dfc3dffc92a30b2cb 100644 (file)
--- 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
 }'
   git submodules sync &&
   git submodules update
 }'

->>>>>>> Stashed changes

 
 ### hooks
 autoload -Uz add-zsh-hook
 
 ### hooks
 autoload -Uz add-zsh-hook