summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2025-03-05 10:03:18 +0200
committerPaul Buetow <paul@buetow.org>2025-03-05 10:03:18 +0200
commit36b9168dbef2258bdbeb37c9717ac39938f9aac0 (patch)
tree1c582f4babbf26e1d81e90ce4f9d5ade89e2282d
parent00e7a603b3b2a9d967dc82ab1d4fd3c72bdffd2d (diff)
jo
-rw-r--r--dotfiles/zsh/zshrc_d/utils.source.zsh4
1 files changed, 0 insertions, 4 deletions
diff --git a/dotfiles/zsh/zshrc_d/utils.source.zsh b/dotfiles/zsh/zshrc_d/utils.source.zsh
index 5f24f39..379b29f 100644
--- a/dotfiles/zsh/zshrc_d/utils.source.zsh
+++ b/dotfiles/zsh/zshrc_d/utils.source.zsh
@@ -459,7 +459,3 @@ tv::text () {
}
zle -N tv::text
bindkey -M viins '^x' tv::text
-<<<<<<< HEAD
-
-=======
->>>>>>> afa49348257597a6087692d0f80a80ccf8ea2273