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

GenericSystem: Add missing calculate_dynamics to docs (backport #1498) #1512

Merged
merged 1 commit into from
Apr 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2024

calculate_dynamics was implemented with #1028 but not added to the docs. I also added a sample config and links to the examples.

image


This is an automatic backport of pull request #1498 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Apr 29, 2024
Copy link
Contributor Author

mergify bot commented Apr 29, 2024

Cherry-pick of 6e7a072 has failed:

On branch mergify/bp/iron/pr-1498
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 6e7a072.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hardware_interface/doc/mock_components_userdoc.rst

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@christophfroehlich christophfroehlich merged commit 4846401 into iron Apr 29, 2024
2 of 11 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/iron/pr-1498 branch April 29, 2024 14:32
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