Skip to content

[CONFLICT] fix(site): adjust agents sidebar spacing (#25857)#25863

Open
github-actions[bot] wants to merge 1 commit into
release/2.34from
backport/25857-to-2.34
Open

[CONFLICT] fix(site): adjust agents sidebar spacing (#25857)#25863
github-actions[bot] wants to merge 1 commit into
release/2.34from
backport/25857-to-2.34

Conversation

@github-actions
Copy link
Copy Markdown

Cherry-pick of #25857

Original PR: #25857 — fix(site): adjust agents sidebar spacing
Merge commit: 22cbf85
Requested by: @tracyjohnsonux

Cherry-pick of 22cbf85 onto release/2.34 had conflicts.
To resolve:
  git fetch origin backport/25857-to-2.34
  git checkout backport/25857-to-2.34
  git cherry-pick -x -m1 22cbf85
  # resolve conflicts
  git push origin backport/25857-to-2.34
@tracyjohnsonux
Copy link
Copy Markdown
Contributor

note this is a companion to #25818 (if that one is blocked, both should be blocked)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant