Skip to content

chore: fix merge conflicts

16440a1
Select commit
Loading
Failed to load commit list.
Closed

fix(patch): cherry-pick 3ff68a9 to release/v0.33.0-preview.14-pr-21884 [CONFLICTS] #21940

chore: fix merge conflicts
16440a1
Select commit
Loading
Failed to load commit list.
Google CLA / cla/google succeeded Mar 10, 2026 in 20s

✅ All contributors are covered under a CLA with Google

See https://cla.developers.google.com/ for more info about Google's Contributor License Agreement (CLA).

ℹ️ Googlers: Go here to view more details and manage scans for this pull request.

Details

The following contributors were found for this pull request:

c1e74e2 Committer: @gemini-cli-robot <gemi********obot​@google.com>
c1e74e2 Author: @gsquared94 <39389231+gsquared94​@users.noreply.github.com>
16440a1 Author: @galz10 <38544478+galz10​@users.noreply.github.com>, <ga*****vi​@google.com>

(Only the first commit for a unique contributor is listed.)