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

This commit is contained in:
Fernando Zuniga 2025-10-06 10:16:11 -04:00
commit 55a6341d6f
1052 changed files with 14 additions and 0 deletions

0
plugins/1password/1password.plugin.zsh Normal file → Executable file
View file

0
plugins/1password/README.md Normal file → Executable file
View file

0
plugins/1password/_opswd Normal file → Executable file
View file

0
plugins/1password/opswd Normal file → Executable file
View file

0
plugins/alias-finder/.zunit.yml Normal file → Executable file
View file

0
plugins/alias-finder/README.md Normal file → Executable file
View file

0
plugins/alias-finder/alias-finder.plugin.zsh Normal file → Executable file
View file

0
plugins/alias-finder/tests/_output/.gitkeep Normal file → Executable file
View file

0
plugins/alias-finder/tests/_support/.gitkeep Normal file → Executable file
View file

0
plugins/alias-finder/tests/_support/bootstrap Normal file → Executable file
View file

0
plugins/alias-finder/tests/test_run.sh Normal file → Executable file
View file

0
plugins/aliases/.gitignore vendored Normal file → Executable file
View file

0
plugins/aliases/README.md Normal file → Executable file
View file

0
plugins/aliases/aliases.plugin.zsh Normal file → Executable file
View file

0
plugins/aliases/cheatsheet.py Normal file → Executable file
View file

0
plugins/aliases/termcolor.py Normal file → Executable file
View file

0
plugins/ansible/README.md Normal file → Executable file
View file

0
plugins/ansible/ansible.plugin.zsh Normal file → Executable file
View file

0
plugins/ant/README.md Normal file → Executable file
View file

0
plugins/ant/_ant Normal file → Executable file
View file

0
plugins/ant/ant.plugin.zsh Normal file → Executable file
View file

0
plugins/apache2-macports/README.md Normal file → Executable file
View file

0
plugins/apache2-macports/apache2-macports.plugin.zsh Normal file → Executable file
View file

0
plugins/arcanist/README.md Normal file → Executable file
View file

0
plugins/arcanist/arcanist.plugin.zsh Normal file → Executable file
View file

0
plugins/archlinux/README.md Normal file → Executable file
View file

0
plugins/archlinux/archlinux.plugin.zsh Normal file → Executable file
View file

0
plugins/arduino-cli/README.md Normal file → Executable file
View file

0
plugins/arduino-cli/arduino-cli.plugin.zsh Normal file → Executable file
View file

0
plugins/argocd/README.md Normal file → Executable file
View file

0
plugins/argocd/argocd.plugin.zsh Normal file → Executable file
View file

0
plugins/asdf/README.md Normal file → Executable file
View file

0
plugins/asdf/asdf.plugin.zsh Normal file → Executable file
View file

0
plugins/autoenv/README.md Normal file → Executable file
View file

0
plugins/autoenv/autoenv.plugin.zsh Normal file → Executable file
View file

0
plugins/autojump/README.md Normal file → Executable file
View file

0
plugins/autojump/autojump.plugin.zsh Normal file → Executable file
View file

0
plugins/autopep8/README.md Normal file → Executable file
View file

0
plugins/autopep8/_autopep8 Normal file → Executable file
View file

0
plugins/aws/README.md Normal file → Executable file
View file

0
plugins/aws/aws.plugin.zsh Normal file → Executable file
View file

0
plugins/azure/README.md Normal file → Executable file
View file

0
plugins/azure/azure.plugin.zsh Normal file → Executable file
View file

0
plugins/battery/README.md Normal file → Executable file
View file

0
plugins/battery/battery.plugin.zsh Normal file → Executable file
View file

0
plugins/bazel/README.md Normal file → Executable file
View file

0
plugins/bazel/_bazel Normal file → Executable file
View file

0
plugins/bazel/bazel.plugin.zsh Normal file → Executable file
View file

0
plugins/bbedit/README.md Normal file → Executable file
View file

0
plugins/bbedit/bbedit.plugin.zsh Normal file → Executable file
View file

0
plugins/bedtools/README.md Normal file → Executable file
View file

0
plugins/bedtools/_bedtools Normal file → Executable file
View file

0
plugins/bgnotify/README.md Normal file → Executable file
View file

0
plugins/bgnotify/bgnotify.plugin.zsh Normal file → Executable file
View file

0
plugins/bower/README.md Normal file → Executable file
View file

0
plugins/bower/_bower Normal file → Executable file
View file

0
plugins/bower/bower.plugin.zsh Normal file → Executable file
View file

0
plugins/branch/README.md Normal file → Executable file
View file

0
plugins/branch/branch.plugin.zsh Normal file → Executable file
View file

0
plugins/brew/README.md Normal file → Executable file
View file

0
plugins/brew/brew.plugin.zsh Normal file → Executable file
View file

0
plugins/bridgetown/README.md Normal file → Executable file
View file

0
plugins/bridgetown/bridgetown.plugin.zsh Normal file → Executable file
View file

0
plugins/buf/README.md Normal file → Executable file
View file

0
plugins/buf/buf.plugin.zsh Normal file → Executable file
View file

0
plugins/bun/README.md Normal file → Executable file
View file

0
plugins/bun/bun.plugin.zsh Normal file → Executable file
View file

0
plugins/bundler/README.md Normal file → Executable file
View file

0
plugins/bundler/_bundler Normal file → Executable file
View file

0
plugins/bundler/bundler.plugin.zsh Normal file → Executable file
View file

0
plugins/cabal/README.md Normal file → Executable file
View file

0
plugins/cabal/cabal.plugin.zsh Normal file → Executable file
View file

0
plugins/cake/README.md Normal file → Executable file
View file

0
plugins/cake/cake.plugin.zsh Normal file → Executable file
View file

0
plugins/cakephp3/README.md Normal file → Executable file
View file

0
plugins/cakephp3/cakephp3.plugin.zsh Normal file → Executable file
View file

0
plugins/capistrano/README.md Normal file → Executable file
View file

0
plugins/capistrano/_capistrano Normal file → Executable file
View file

0
plugins/capistrano/capistrano.plugin.zsh Normal file → Executable file
View file

0
plugins/cask/README.md Normal file → Executable file
View file

0
plugins/cask/cask.plugin.zsh Normal file → Executable file
View file

0
plugins/catimg/README.md Normal file → Executable file
View file

0
plugins/catimg/catimg.plugin.zsh Normal file → Executable file
View file

0
plugins/catimg/catimg.sh Normal file → Executable file
View file

0
plugins/catimg/colors.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

Before After
Before After

0
plugins/celery/README.md Normal file → Executable file
View file

0
plugins/celery/_celery Normal file → Executable file
View file

0
plugins/charm/README.md Normal file → Executable file
View file

0
plugins/charm/charm.plugin.zsh Normal file → Executable file
View file

0
plugins/chezmoi/README.md Normal file → Executable file
View file

0
plugins/chezmoi/chezmoi.plugin.zsh Normal file → Executable file
View file

0
plugins/chruby/README.md Normal file → Executable file
View file

0
plugins/chruby/chruby.plugin.zsh Normal file → Executable file
View file

0
plugins/chucknorris/.gitignore vendored Normal file → Executable file
View file

0
plugins/chucknorris/README.md Normal file → Executable file
View file

0
plugins/chucknorris/chucknorris.plugin.zsh Normal file → Executable file
View file

0
plugins/chucknorris/fortunes/chucknorris Normal file → Executable file
View file

0
plugins/cloudfoundry/README.md Normal file → Executable file
View file

0
plugins/cloudfoundry/cloudfoundry.plugin.zsh Normal file → Executable file
View file

0
plugins/codeclimate/README.md Normal file → Executable file
View file

Some files were not shown because too many files have changed in this diff Show more