Resolved merge conflicts: kept updated .gitpod.Dockerfile and .gitpod.yml

2026-01-30 02:44:42 +01:00 · 2025-10-06 10:16:11 -04:00 · 2025-10-06 10:16:11 -04:00 · 55a6341d6f
commit 55a6341d6f
parent c6482fa5be
1052 changed files with 14 additions and 0 deletions
--- a/lib/async_prompt.zsh
+++ b/lib/async_prompt.zsh
--- a/lib/bzr.zsh
+++ b/lib/bzr.zsh
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
--- a/lib/compfix.zsh
+++ b/lib/compfix.zsh
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
--- a/lib/git.zsh
+++ b/lib/git.zsh
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
--- a/lib/history.zsh
+++ b/lib/history.zsh
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
--- a/lib/nvm.zsh
+++ b/lib/nvm.zsh
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
--- a/lib/tests/cli.test.zsh
+++ b/lib/tests/cli.test.zsh
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
--- a/lib/vcs_info.zsh
+++ b/lib/vcs_info.zsh