Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bad merge error #22166

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

SeanCurtis-TRI
Copy link
Contributor

@SeanCurtis-TRI SeanCurtis-TRI commented Nov 13, 2024

A deprecated declaration was leaked back into pr 21929. This removes it again.

Note: there is no implementation.


This change is Reviewable

A deprecated declaration was leaked back into pr 21929. This removes it
again.

Note: there is no implementation.
@SeanCurtis-TRI SeanCurtis-TRI added release notes: none This pull request should not be mentioned in the release notes status: single reviewer ok https://drake.mit.edu/reviewable.html labels Nov 13, 2024
Copy link
Contributor Author

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+(release notes: none) (assuming we get this into the current release, v1.35.0 -- #22137)
+(status: single reviewer ok)
+@xuchenhan-tri for both reviews, please.

Reviewable status: LGTM missing from assignee xuchenhan-tri(platform)

Copy link
Contributor

@xuchenhan-tri xuchenhan-tri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:x2

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! all discussions resolved, LGTM from assignee xuchenhan-tri(platform)

@xuchenhan-tri xuchenhan-tri merged commit 479515d into RobotLocomotion:master Nov 13, 2024
9 checks passed
@SeanCurtis-TRI SeanCurtis-TRI deleted the PR_fix_21929 branch November 13, 2024 17:52
RussTedrake pushed a commit to RussTedrake/drake that referenced this pull request Dec 15, 2024
A deprecated declaration was leaked back into pr 21929. This removes it
again.

Note: there is no implementation.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release notes: none This pull request should not be mentioned in the release notes status: single reviewer ok https://drake.mit.edu/reviewable.html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants