summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2025-03-05 09:27:16 +0200
committerPaul Buetow <paul@buetow.org>2025-03-05 09:27:16 +0200
commit424b52b1cd95f12c66997b85bd4a86896086bb54 (patch)
tree9b19fc8f1602c296d9420f2e2f5d11233202169b
parent445cc16d005a3ba1b3e29e0c80cbe58ba14aa259 (diff)
parent00e7a603b3b2a9d967dc82ab1d4fd3c72bdffd2d (diff)
Merge branch 'master' of codeberg.org:snonux/rexfiles
-rw-r--r--dotfiles/zsh/zshrc_d/utils.source.zsh4
1 files changed, 4 insertions, 0 deletions
diff --git a/dotfiles/zsh/zshrc_d/utils.source.zsh b/dotfiles/zsh/zshrc_d/utils.source.zsh
index 9efc157..336afa2 100644
--- a/dotfiles/zsh/zshrc_d/utils.source.zsh
+++ b/dotfiles/zsh/zshrc_d/utils.source.zsh
@@ -459,3 +459,7 @@ tv::text () {
}
zle -N tv::text
bindkey -M viins '^x' tv::text
+<<<<<<< HEAD
+
+=======
+>>>>>>> afa49348257597a6087692d0f80a80ccf8ea2273